aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations.rb
Commit message (Collapse)AuthorAgeFilesLines
...
| * When preloading a belongs_to, the target should still be set (to nil) if ↵Jon Leighton2011-01-031-0/+1
| | | | | | | | there is no foreign key present. And the loaded flag should be set on the association proxy. This then allows us to remove the foreign_key_present? check from BelongsToAssociation#find_target. Also added a test for the same thing on polymorphic associations.
| * Allow assignment on has_one :through where the owner is a new record [#5137 ↵Jon Leighton2011-01-031-11/+12
| | | | | | | | | | | | | | | | | | | | state:resolved] This required changing the code to keep the association proxy for a belongs_to around, despite its target being nil. Which in turn required various changes to the way that stale target checking is handled, in order to support various edge cases (loaded target is nil then foreign key added, foreign key is changed and then changed back, etc). A side effect is that the code is nicer and more succinct. Note that I am removing test_no_unexpected_aliasing since that is basically checking that the proxy for a belongs_to *does* change, which is the exact opposite of the intention of this commit. Also adding various tests for various edge cases and related things. Phew, long commit message!
| * Have a proper AssociationReflection#foreign_type method rather than using ↵Jon Leighton2011-01-031-7/+1
| | | | | | | | options[:foreign_type]
| * Add documentation for the :foreign_type option on belongs_toJon Leighton2011-01-031-0/+5
| |
| * Rename AssociationReflection#primary_key_name to foreign_key, since the ↵Jon Leighton2010-12-311-2/+2
| | | | | | | | options key which it relates to is :foreign_key
| * Get rid of extra_conditions param from configure_dependency_for_has_many. I ↵Jon Leighton2010-12-311-9/+3
| | | | | | | | can't see a particularly plausible argument for this being used by plugins, and if they really want they can just redefine the callback or whatever. Note also that before my recent commit the extra_conditions param was completely ignored for :dependent => :destroy.
| * Refactor configure_dependency_for_has_many to use ↵Jon Leighton2010-12-311-38/+20
| | | | | | | | AssociationCollection#delete_all. It was necessary to change test_before_destroy in lifecycle_test.rb so that it checks topic.replies.size *before* doing the destroy, as afterwards it will now (correctly) be 0.
| * Add a HasAssociation module for common code for has_* associationsJon Leighton2010-12-261-0/+2
| |
| * Raise an error for associations which try to go :through a polymorphic ↵Jon Leighton2010-12-231-1/+7
| | | | | | | | association [#6212 state:resolved]
| * If a has_many goes :through a belongs_to, and the foreign key of the ↵Jon Leighton2010-12-231-1/+5
| | | | | | | | belongs_to changes, then the has_many should be considered stale.
| * Improved strategy for updating a belongs_to association when the foreign key ↵Jon Leighton2010-12-231-42/+1
| | | | | | | | changes. Rather than resetting each affected association when the foreign key changes, we should lazily check for 'staleness' (where fk does not match target id) when the association is accessed.
| * Revert "Optimize <association>_ids for hm:t with belongs_to source". The ↵Jon Leighton2010-12-231-8/+1
| | | | | | | | | | | | | | | | | | | | optimisation has too many edge cases, such as when the reflection, source reflection, or through reflection has conditions, orders, etc. [#6153 state:resolved] This reverts commit 373b053dc8b99dac1abc3879a17a2bf8c30302b5. Conflicts: activerecord/lib/active_record/associations.rb
| * Don't allow a has_one association to go :through a collection association ↵Jon Leighton2010-12-231-0/+6
| | | | | | | | [#2976 state:resolved]
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-121-0/+41
|\| | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb
| * removing method to prevent warningsAaron Patterson2010-12-081-0/+4
| |
| * Setting the id of a belongs_to object updates all referenced objects [#2989 ↵Jeff Dean2010-12-081-0/+37
| | | | | | | | state:resolved]
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-271-552/+8
|\| | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * breaking classes up in to respective filesAaron Patterson2010-11-231-574/+1
| |
| * class inheritable attributes is used no more! all internal use of class ↵Josh Kalderimis2010-11-201-6/+7
| | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-171-1/+1
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb
| * use persisted? instead of new_record? wherever possibleDavid Chelimsky2010-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | - persisted? is the API defined in ActiveModel - makes it easier for extension libraries to conform to ActiveModel APIs without concern for whether the extended object is specifically ActiveRecord [#5927 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-081-20/+18
|\| | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * reduce duplication in assiciations #construct()Aaron Patterson2010-11-061-9/+3
| |
| * make sure we keep parent records in orderAaron Patterson2010-11-061-6/+6
| |
| * only call to_s on the association variable onceAaron Patterson2010-11-051-2/+5
| |
| * simplify instantiate in the join parts objectAaron Patterson2010-11-051-8/+7
| |
| * index is not used, so removing itAaron Patterson2010-11-051-1/+1
| |
| * reduce method calls to the join base objectAaron Patterson2010-11-051-4/+6
| |
* | Fix naughty trailing whitespaceJon Leighton2010-10-311-49/+49
| |
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-311-11/+38
|\| | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
| * refactoring find_join_associationAaron Patterson2010-10-301-5/+6
| |
| * Fix issues when including the same association multiple times and mixing ↵Ernie Miller2010-10-301-11/+37
| | | | | | | | joins/includes together.
* | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-281-16/+16
|\| | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
| * removing space errorsAaron Patterson2010-10-221-45/+45
| |
| * Delete unused methods in JoinAssociationJon Leighton2010-10-131-8/+0
| |
| * Renaming and formatting changes in JoinDependencyJon Leighton2010-10-131-47/+51
| |
| * Refactor JoinDependency and friends so that a JoinAssociation can produce an ↵Jon Leighton2010-10-131-145/+265
| | | | | | | | arbitrary number of joins, which will be needed in order to support nested through associations.
* | Fix typoJon Leighton2010-10-191-1/+1
| |
* | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| |
* | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| |
* | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-191-8/+0
| | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\!
* | Small refactoringJon Leighton2010-10-191-6/+2
| |
* | Bugfix/refactoringJon Leighton2010-10-191-6/+6
| |
* | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-191-6/+4
| | | | | | | | association, where the source is a has_one or has_many
* | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-191-6/+9
| | | | | | | | through association
* | Make sure nested through associations are read onlyJon Leighton2010-10-151-0/+6
| |
* | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| |
* | First bit of support for habtm in through assocs - ↵Jon Leighton2010-10-131-10/+35
| | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes
* | Some small tweaks on the last commitJon Leighton2010-10-121-17/+5
| |
* | Extract aliasing code from JoinDependency and JoinAssociation into a ↵Jon Leighton2010-10-121-41/+15
| | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well.