| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Move the code which builds a scope for through associations into a generic ↵ | Jon Leighton | 2011-03-10 | 1 | -3/+3 |
| | | | | | AssociationScope class which is capable of building a scope for any association. | ||||
| * | Fix ↵ | Jon Leighton | 2011-03-07 | 1 | -1/+1 |
| | | | | | test_has_many_association_through_a_has_many_association_with_nonstandard_primary_keys | ||||
| * | Refactor ThroughAssociation#join_to to be much smaller, and independent of ↵ | Jon Leighton | 2011-03-06 | 1 | -0/+6 |
| | | | | | construct_owner_conditions. | ||||
| * | Push source_type and polymorphic conditions out of ThroughAssociation and ↵ | Jon Leighton | 2011-03-05 | 1 | -10/+11 |
| | | | | | JoinDependency::JoinAssociation and into the reflection instead. | ||||
| * | Add a test for STI on the through where the through is nested, and change ↵ | Jon Leighton | 2011-03-05 | 1 | -0/+3 |
| | | | | | the code which support this | ||||
| * | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2011-03-04 | 1 | -18/+65 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb 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_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb | ||||
| | * | Rewrote AssociationPreload. | Jon Leighton | 2011-02-28 | 1 | -4/+6 |
| | | | |||||
| | * | Delegate Association#options to the reflection, and replace ↵ | Jon Leighton | 2011-02-21 | 1 | -0/+8 |
| | | | | | | | | | 'reflection.options' with 'options'. Also add through_options and source_options methods for through associations. | ||||
| | * | Split AssociationProxy into an Association class (and subclasses) which ↵ | Jon Leighton | 2011-02-18 | 1 | -1/+1 |
| | | | | | | | | | manages the association, and a CollectionProxy class which is *only* a proxy. Singular associations no longer have a proxy. See CHANGELOG for more. | ||||
| | * | Ensure that association_ids uses the correct attribute where the association ↵ | Jon Leighton | 2011-02-18 | 1 | -0/+4 |
| | | | | | | | | | is a has_many :through with a :primary_key option on the source reflection. [#6376 state:resolved] | ||||
| | * | DRY up the code which instantiates the association proxy | Jon Leighton | 2011-01-11 | 1 | -0/+25 |
| | | | |||||
| | * | Implement deprecated version of AssociationReflection#primary_key_name, ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+6 |
| | | | | | | | | | which has been renamed to #foreign_key. Also bumping the deprecation_horizon in Active Support to 3.1. | ||||
| | * | Have a proper AssociationReflection#foreign_type method rather than using ↵ | Jon Leighton | 2011-01-03 | 1 | -0/+4 |
| | | | | | | | | | options[:foreign_type] | ||||
| | * | Rename AssociationReflection#primary_key_name to foreign_key, since the ↵ | Jon Leighton | 2010-12-31 | 1 | -7/+7 |
| | | | | | | | | | options key which it relates to is :foreign_key | ||||
| | * | Now we can drop-kick AssociationReflection#dependent_conditions into oblivion. | Jon Leighton | 2010-12-31 | 1 | -11/+0 |
| | | | |||||
| | * | Raise an error for associations which try to go :through a polymorphic ↵ | Jon Leighton | 2010-12-23 | 1 | -1/+5 |
| | | | | | | | | | association [#6212 state:resolved] | ||||
| | * | Improved strategy for updating a belongs_to association when the foreign key ↵ | Jon Leighton | 2010-12-23 | 1 | -1/+4 |
| | | | | | | | | | 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. | ||||
| | * | Don't allow a has_one association to go :through a collection association ↵ | Jon Leighton | 2010-12-23 | 1 | -0/+4 |
| | | | | | | | | | [#2976 state:resolved] | ||||
| | * | Fix problem where wrong keys are used in JoinAssociation when an association ↵ | Jon Leighton | 2010-12-20 | 1 | -0/+4 |
| | | | | | | | | | goes :through a belongs_to [#2801 state:resolved] | ||||
| | * | Fix various issues with the :primary_key option in :through associations ↵ | Jon Leighton | 2010-12-15 | 1 | -1/+5 |
| | | | | | | | | | [#2421 state:resolved] | ||||
| | * | reduce method calls | Aaron Patterson | 2010-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-12-12 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | reduce method calls | Aaron Patterson | 2010-12-10 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-27 | 1 | -11/+9 |
| |\| | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb | ||||
| | * | class inheritable attributes is used no more! all internal use of class ↵ | Josh Kalderimis | 2010-11-20 | 1 | -11/+9 |
| | | | | | | | | | | | | | inheritable has been changed to class_attribute. class inheritable attributes has been deprecated. Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 1 | -21/+21 |
| | | | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb | ||||
| | * | use grep instead of select + is_a? | Aaron Patterson | 2010-10-20 | 1 | -2/+2 |
| | | | |||||
| * | | Add some comments for ThroughReflection#through_reflection_chain | Jon Leighton | 2010-10-19 | 1 | -1/+10 |
| | | | |||||
| * | | Remove various comments and code which were just being used during the ↵ | Jon Leighton | 2010-10-19 | 1 | -24/+0 |
| | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\! | ||||
| * | | Add explicit tests for the nested through association changes in reflection.rb | Jon Leighton | 2010-10-19 | 1 | -2/+13 |
| | | | |||||
| * | | Bugfix/refactoring | Jon Leighton | 2010-10-19 | 1 | -0/+9 |
| | | | |||||
| * | | Remove unused methods | Jon Leighton | 2010-10-19 | 1 | -11/+0 |
| | | | |||||
| * | | Support for :primary_key option on the source reflection of a through ↵ | Jon Leighton | 2010-10-19 | 1 | -0/+8 |
| | | | | | | | | | association, where the source is a has_one or has_many | ||||
| * | | Properly support conditions on any of the reflections involved in a nested ↵ | Jon Leighton | 2010-10-19 | 1 | -3/+50 |
| | | | | | | | | | through association | ||||
| * | | Make sure nested through associations are read only | Jon Leighton | 2010-10-15 | 1 | -0/+4 |
| | | | |||||
| * | | Integrate nested support into ThroughAssociationScope, using my concept of ↵ | Jon Leighton | 2010-10-02 | 1 | -10/+40 |
| | | | | | | | | | generating a 'chain' of reflections to be joined. It seems to work at the moment, all existing tests are passing. There may be further complications as we add more test cases for nested associations, though. | ||||
| * | | Started implementing nested :through associations by using the existing ↵ | Jon Leighton | 2010-10-01 | 1 | -0/+15 |
| | | | | | | | | | structure of ThroughAssociationScope rather than layering a module over the top | ||||
| * | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 1 | -3/+3 |
| |/ | |||||
| * | Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵ | Santiago Pastorino | 2010-08-14 | 1 | -13/+13 |
| | | | | | 's/[ \t]*$//' -i {} \;) | ||||
| * | applied guidelines to "# =>" | Paco Guzman | 2010-08-12 | 1 | -1/+1 |
| | | |||||
| * | Tidy up previous commit. | José Valim | 2010-08-02 | 1 | -14/+12 |
| | | |||||
| * | returns not returned . fixing documentation for reflection | Neeraj Singh | 2010-07-30 | 1 | -28/+30 |
| | | |||||
| * | bringing consistency in comments | Neeraj Singh | 2010-07-24 | 1 | -14/+17 |
| | | |||||
| * | Adds basic description and title. | Rizwan Reza | 2010-06-16 | 1 | -15/+30 |
| | | |||||
| * | Fix a bunch of minor spelling mistakes | Evgeniy Dolzhenko | 2010-06-11 | 1 | -4/+4 |
| | | |||||
| * | Bring back +extra_conditions+. This effectively reverts ↵ | Carl Lerche | 2010-04-03 | 1 | -1/+2 |
| | | | | | 386b7bfd9d78a6d8c8bc7cc4a310df806ad0ba57 | ||||
| * | Make the query built by has_many ...., :dependent => :____ lazy since all ↵ | Carl Lerche | 2010-04-02 | 1 | -0/+10 |
| | | | | | the information is not really available yet. | ||||
| * | cleaning up some test warnings | Aaron Patterson | 2010-03-14 | 1 | -3/+5 |
| | | | | | Signed-off-by: wycats <wycats@gmail.com> | ||||
| * | Renamed AssociationReflection #collection_association? to #collection?. | Eloy Duran | 2010-01-08 | 1 | -5/+5 |
| | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |