| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-11-27 | 1 | -552/+8 | |
| |\| | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb | |||||
| | * | breaking classes up in to respective files | Aaron Patterson | 2010-11-23 | 1 | -574/+1 | |
| | | | ||||||
| | * | class inheritable attributes is used no more! all internal use of class ↵ | Josh Kalderimis | 2010-11-20 | 1 | -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_through | Jon Leighton | 2010-11-17 | 1 | -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 possible | David Chelimsky | 2010-11-09 | 1 | -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_through | Jon Leighton | 2010-11-08 | 1 | -20/+18 | |
| |\| | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb | |||||
| | * | reduce duplication in assiciations #construct() | Aaron Patterson | 2010-11-06 | 1 | -9/+3 | |
| | | | ||||||
| | * | make sure we keep parent records in order | Aaron Patterson | 2010-11-06 | 1 | -6/+6 | |
| | | | ||||||
| | * | only call to_s on the association variable once | Aaron Patterson | 2010-11-05 | 1 | -2/+5 | |
| | | | ||||||
| | * | simplify instantiate in the join parts object | Aaron Patterson | 2010-11-05 | 1 | -8/+7 | |
| | | | ||||||
| | * | index is not used, so removing it | Aaron Patterson | 2010-11-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | reduce method calls to the join base object | Aaron Patterson | 2010-11-05 | 1 | -4/+6 | |
| | | | ||||||
| * | | Fix naughty trailing whitespace | Jon Leighton | 2010-10-31 | 1 | -49/+49 | |
| | | | ||||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-31 | 1 | -11/+38 | |
| |\| | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb | |||||
| | * | refactoring find_join_association | Aaron Patterson | 2010-10-30 | 1 | -5/+6 | |
| | | | ||||||
| | * | Fix issues when including the same association multiple times and mixing ↵ | Ernie Miller | 2010-10-30 | 1 | -11/+37 | |
| | | | | | | | | | joins/includes together. | |||||
| * | | Merge branch 'master' into nested_has_many_through | Jon Leighton | 2010-10-28 | 1 | -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 errors | Aaron Patterson | 2010-10-22 | 1 | -45/+45 | |
| | | | ||||||
| | * | Delete unused methods in JoinAssociation | Jon Leighton | 2010-10-13 | 1 | -8/+0 | |
| | | | ||||||
| | * | Renaming and formatting changes in JoinDependency | Jon Leighton | 2010-10-13 | 1 | -47/+51 | |
| | | | ||||||
| | * | Refactor JoinDependency and friends so that a JoinAssociation can produce an ↵ | Jon Leighton | 2010-10-13 | 1 | -145/+265 | |
| | | | | | | | | | arbitrary number of joins, which will be needed in order to support nested through associations. | |||||
| * | | Fix typo | Jon Leighton | 2010-10-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Remove obsolete autoload | Jon Leighton | 2010-10-19 | 1 | -1/+0 | |
| | | | ||||||
| * | | Add some API documentation about nested through associations | Jon Leighton | 2010-10-19 | 1 | -8/+52 | |
| | | | ||||||
| * | | Remove various comments and code which were just being used during the ↵ | Jon Leighton | 2010-10-19 | 1 | -8/+0 | |
| | | | | | | | | | development of nested through association support (OMFGZ, I might just have nearly finished this\! | |||||
| * | | Small refactoring | Jon Leighton | 2010-10-19 | 1 | -6/+2 | |
| | | | ||||||
| * | | Bugfix/refactoring | Jon Leighton | 2010-10-19 | 1 | -6/+6 | |
| | | | ||||||
| * | | Support for :primary_key option on the source reflection of a through ↵ | Jon Leighton | 2010-10-19 | 1 | -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 Leighton | 2010-10-19 | 1 | -6/+9 | |
| | | | | | | | | | through association | |||||
| * | | Make sure nested through associations are read only | Jon Leighton | 2010-10-15 | 1 | -0/+6 | |
| | | | ||||||
| * | | Fix small bug which was shown by the last commit | Jon Leighton | 2010-10-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | First bit of support for habtm in through assocs - ↵ | Jon Leighton | 2010-10-13 | 1 | -10/+35 | |
| | | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes | |||||
| * | | Some small tweaks on the last commit | Jon Leighton | 2010-10-12 | 1 | -17/+5 | |
| | | | ||||||
| * | | Extract aliasing code from JoinDependency and JoinAssociation into a ↵ | Jon Leighton | 2010-10-12 | 1 | -41/+15 | |
| | | | | | | | | | separate AliasTracker class. This can then be used by ThroughAssociationScope as well. | |||||
| * | | Refactoring to remove duplication introduced by the last commit | Jon Leighton | 2010-10-10 | 1 | -160/+145 | |
| | | | ||||||
| * | | Add support for nested through associations in JoinAssociation. Hence ↵ | Jon Leighton | 2010-10-09 | 1 | -89/+85 | |
| | | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored. | |||||
| * | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵ | Jon Leighton | 2010-10-06 | 1 | -183/+307 | |
| | | | | | | | | | including adding some explanatory comments, but more importantly structures it in such a way as to allow a JoinAssociation to produce an arbitrary number of actual joins, which will be necessary for nested has many through support. Also added 3 tests covering functionality which existed but was not previously covered. | |||||
| * | | Initial nested_has_many_through support [#1152] | Bodaniel Jeanes | 2010-09-26 | 1 | -0/+1 | |
| |/ | ||||||
| * | avoid a proc object | Aaron Patterson | 2010-09-22 | 1 | -1/+1 | |
| | | ||||||
| * | avoid creating a range object | Aaron Patterson | 2010-09-22 | 1 | -1/+1 | |
| | | ||||||
| * | drying up construct_association | Aaron Patterson | 2010-09-21 | 1 | -15/+15 | |
| | | ||||||
| * | dry up some conditionals | Aaron Patterson | 2010-09-21 | 1 | -3/+4 | |
| | | ||||||
| * | fixing case / when indentation | Aaron Patterson | 2010-09-21 | 1 | -19/+19 | |
| | | ||||||
| * | fix case / when indentation | Aaron Patterson | 2010-09-21 | 1 | -18/+18 | |
| | | ||||||
| * | avoid a hash lookup | Aaron Patterson | 2010-09-21 | 1 | -2/+2 | |
| | | ||||||
| * | refacoring duplicate code. <3 <3 <3 | Aaron Patterson | 2010-09-21 | 1 | -2/+3 | |
| | | ||||||
| * | this reject can be replaced with compact | Aaron Patterson | 2010-09-21 | 1 | -1/+1 | |
| | | ||||||
| * | removing unused code | Aaron Patterson | 2010-09-21 | 1 | -2/+1 | |
| | | ||||||
| * | remove some repeated code | Aaron Patterson | 2010-09-21 | 1 | -2/+2 | |
| | | ||||||
| * | break up giant method | Aaron Patterson | 2010-09-21 | 1 | -62/+72 | |
| | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |