aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record
Commit message (Expand)AuthorAgeFilesLines
* Use Base#type_condition in JoinAssociationJon Leighton2011-03-052-17/+6
* Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-053-45/+11
* Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-052-13/+25
* Stop identity-mapping the through records in the preloader since I fixed the ...Jon Leighton2011-03-041-5/+0
* Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
* When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-041-2/+4
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-0/+5
|\
| * Move ActiveModel::AttributeMethods#attribute_methods_generated? to ActiveReco...Alexander Uvarov2011-03-011-0/+11
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0497-4167/+5631
|\|
| * Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-2811-626/+618
| * Rewrote AssociationPreload.Jon Leighton2011-02-2816-439/+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. [#6...Aaron Patterson2011-02-252-1/+14
| * 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
| * | Relation will delegate to AR::Base which already uses the Dynamic finders, so...Aaron Patterson2011-02-221-8/+3
| |/
| * Use proper objects to do the work to build the associations (adding methods, ...Jon Leighton2011-02-2113-406/+537
| * 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 'reflection.optio...Jon Leighton2011-02-218-47/+57
| * Singular associations no longer use a proxy, so no need to check for the prox...Jon Leighton2011-02-213-8/+2
| * Associations - where possible, call attributes methods rather than directly a...Jon Leighton2011-02-2111-179/+179
| * 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 object...Aaron Patterson2011-02-181-3/+2
| * | 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 nee...Xavier Noria2011-02-181-4/+1
| | * 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
| |\| |
| | * | Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-1815-350/+361
| | * | Add :nodoc: to ThroughAssociation and HasOneAssociationJon Leighton2011-02-182-2/+2
| | * | Allow building and then later saving has_many :through records, such that the...Jon Leighton2011-02-182-11/+77
| | * | Ensure that association_ids uses the correct attribute where the association ...Jon Leighton2011-02-182-2/+9
| | * | explicitly allowing lolqueriesAaron Patterson2011-02-161-10/+1
| | * | use the arel table rather than generating stringsAaron Patterson2011-02-161-1/+1
| | * | no need for Array.wrapAaron Patterson2011-02-161-1/+1