aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
Commit message (Expand)AuthorAgeFilesLines
* Fix for lighthouse #6741Nick Howard2011-05-011-3/+6
* Extract the constraint-building for joins in JoinAssociation into a separate ...Jon Leighton2011-04-141-8/+14
* Remove `#among?` from Active SupportPrem Sichanugrist2011-04-135-5/+5
* Removing the scope-caching which happens on association proxies, because the ...Jon Leighton2011-04-122-14/+0
* Change Object#either? to Object#among? -- thanks to @jamesarosen for the sugg...David Heinemeier Hansson2011-04-125-5/+5
* Using Object#in? and Object#either? in various placesPrem Sichanugrist2011-04-115-5/+14
* TableAlias leg ordering has changed, so change accordinglyAaron Patterson2011-03-301-1/+1
* Make clearing of HABTM join table contents happen in an after_destory callback.Murray Steele2011-03-231-12/+12
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-161-1/+1
|\
| * Add additional text to NotImplementedErrors [#6328 state:resolved]Mike Gehard2011-03-121-1/+1
* | Fix tests under postgres - we should always put conditions in the WHERE part ...Jon Leighton2011-03-123-18/+22
* | Resolve some TODO comments which I decided did not need anything doneJon Leighton2011-03-122-8/+5
* | Abstract some common code from AssociationScope and JoinDependency::JoinAssoc...Jon Leighton2011-03-113-97/+82
* | Refactor JoinAssociationJon Leighton2011-03-101-100/+54
* | Rename Reflection#through_reflection_chain and #through_options to Reflection...Jon Leighton2011-03-103-18/+15
* | Move the code which builds a scope for through associations into a generic As...Jon Leighton2011-03-107-209/+155
* | Fix test_has_many_association_through_a_has_many_association_with_nonstandard...Jon Leighton2011-03-071-1/+1
* | Refactor ThroughAssociation#join_to to be much smaller, and independent of co...Jon Leighton2011-03-061-84/+28
* | Refactor ThroughAssociation#tables to just be a flat array of tables in the o...Jon Leighton2011-03-061-75/+70
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-051-2/+2
|\|
| * Active Record typos.R.T. Lechow2011-03-051-2/+2
| * When preloading has_and_belongs_to_many associations, we should only instanti...Jon Leighton2011-03-041-2/+4
| * Fix a couple of tests in join_model_test.rb which were failing when the ident...Jon Leighton2011-03-041-2/+2
* | Use Base#type_condition in JoinAssociationJon Leighton2011-03-051-15/+4
* | Push source_type and polymorphic conditions out of ThroughAssociation and Joi...Jon Leighton2011-03-052-35/+0
* | Add a test for STI on the through where the through is nested, and change the...Jon Leighton2011-03-051-13/+22
* | 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
|\|
* | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0442-2259/+3173
|\|
| * Move JoinDependency and friends from ActiveRecord::Associations::ClassMethods...Jon Leighton2011-02-288-620/+612
| * Rewrote AssociationPreload.Jon Leighton2011-02-2811-0/+553
| * Use proper objects to do the work to build the associations (adding methods, ...Jon Leighton2011-02-2111-4/+501
| * 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-217-47/+49
| * 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
| * 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-1811-473/+527
| |\
| | * Split AssociationProxy into an Association class (and subclasses) which manag...Jon Leighton2011-02-189-276/+287
| | * 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-181-4/+46
| * | Don't shadow outer local variable.Emilio Tagua2011-02-151-2/+2
| * | Merge remote branch 'rails/master' into identity_mapEmilio Tagua2011-02-1514-1044/+873
| |\|
| | * Add a transaction wrapper in add_to_target. This means that #build will now a...Jon Leighton2011-02-141-27/+27
| | * Inline ensure_owner_is_persisted! as it is only called from one placeJon Leighton2011-02-141-8/+4
| | * @target should always be an arrayJon Leighton2011-02-141-1/+2