aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-03-143-8/+15
|\
| * Adjust unique constraint comment to include info about the RecordNotUnique ↵Anders Elfving2011-03-131-4/+11
| | | | | | | | exception
| * remove some blanksPaco Guzman2011-03-112-4/+4
| |
* | Fixed a bug when empty? was called on a grouped Relation that wasn't loadedChris Oliver2011-03-121-1/+4
| | | | | | | | | | | | [#5829 state:resolved] Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
|/ | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Referencing a table via the ON condition in a join should force that table ↵Jon Leighton2011-03-071-1/+12
| | | | to be eager-loaded via a JOIN rather than via subsequent queries.
* use Arel::Table#alias rather than passing the :as parameterAaron Patterson2011-03-052-4/+4
|
* Active Record typos.R.T. Lechow2011-03-053-4/+4
|
* fixes a missmatched column in examplemjy2011-03-051-1/+1
|
* implements ActiveRecord::Base.connection_config to be able to check the ↵Xavier Noria2011-03-051-0/+10
| | | | configuration of the current connection at runtime
* When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-2/+4
| | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
* Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | identity map is turned off
* Move ActiveModel::AttributeMethods#attribute_methods_generated? to ↵Alexander Uvarov2011-03-011-0/+11
| | | | | | | | ActiveRecord, so it's flexible now [#6428 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* Move JoinDependency and friends from ↵Jon Leighton2011-02-2811-626/+618
| | | | ActiveRecord::Associations::ClassMethods to just ActiveRecord::Associations
* Rewrote AssociationPreload.Jon Leighton2011-02-2817-440/+565
|
* use an attribute rather than a SQL literalAaron Patterson2011-02-261-1/+1
|
* removing limits and offsets from COUNT queries unless both are specified. ↵Aaron Patterson2011-02-252-1/+14
| | | | [#6268 state:resolved]
* only take the limit if there is a limit to takeAaron Patterson2011-02-251-1/+1
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-251-1/+1
|\
| * Fix missing inheritance from AR::Base in docsJosep M. Bach2011-02-241-1/+1
| |
* | fixes: ActiveRecord::Base.scopes includes all scopes defined in all subclassesEric Allam2011-02-241-2/+3
| |
* | Fix observer callbacks firing multiple times on descendant instancesKamal Fariz Mahyuddin2011-02-221-1/+8
| |
* | We're in 2011, let's update our licensePrem Sichanugrist2011-02-221-1/+1
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Relation will delegate to AR::Base which already uses the Dynamic finders, ↵Aaron Patterson2011-02-221-8/+3
|/ | | | so eliminate duplicate calls
* Use proper objects to do the work to build the associations (adding methods, ↵Jon Leighton2011-02-2113-406/+537
| | | | callbacks etc) rather than calling a whole bunch of methods with rather long names.
* Rename target_klass to klassJon Leighton2011-02-213-10/+10
|
* Delegate through_reflection and source_reflection to reflectionJon Leighton2011-02-213-34/+34
|
* Delegate Association#options to the reflection, and replace ↵Jon Leighton2011-02-218-47/+57
| | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations.
* Singular associations no longer use a proxy, so no need to check for the ↵Jon Leighton2011-02-213-8/+2
| | | | proxy type on assignment.
* Associations - where possible, call attributes methods rather than directly ↵Jon Leighton2011-02-2111-179/+179
| | | | accessing the instance variables
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-213-3/+27
|\
| * copy-edits 8d96b89Xavier Noria2011-02-212-8/+10
| |
| * Adding new examples for update_all methodRodrigo Navarro2011-02-201-0/+6
| |
| * Adding examplesRodrigo Navarro2011-02-201-0/+2
| |
| * Typo: fixing the theNicholas Rowe2011-02-191-1/+1
| |
| * Clarification of ActiveRecord ActiveModel validation documentationPeer Allan2011-02-182-2/+16
| |
* | instance_methods includes public and protected, so reduce funcalls and ↵Aaron Patterson2011-02-181-3/+2
| | | | | | | | object allocs
* | AR::AttributeMethods does not need to be included in an AR::Base class.Aaron Patterson2011-02-181-1/+5
|/
* merges docrailsXavier Noria2011-02-183-6/+3
|\
| * removes unrealistic example (authentication plus gender?), that it is not ↵Xavier Noria2011-02-181-4/+1
| | | | | | | | needed anyway
| * Clarify Example in ActiveRecord baseNicholas Rowe2011-02-181-1/+1
| |
| * Fix Typos: remove several occurences of the theNicholas Rowe2011-02-172-2/+2
| |
* | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-181-1/+1
|\ \
| * | just use the list of column names to generate attribute methodsAaron Patterson2011-02-181-1/+1
| | |
* | | No need to have reinit_with inside an InstanceMethods module.Emilio Tagua2011-02-181-17/+15
| | |
* | | Initialize @target instead asking if it is defined.Emilio Tagua2011-02-181-1/+2
| | |
* | | Reindent and remove wrong line left in merge by mistake.Emilio Tagua2011-02-181-4/+3
| | |
* | | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1821-609/+692
|\| | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/association.rb activerecord/lib/active_record/fixtures.rb
| * | Split AssociationProxy into an Association class (and subclasses) which ↵Jon Leighton2011-02-1815-350/+361
| | | | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more.
| * | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| | |