aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
Commit message (Collapse)AuthorAgeFilesLines
...
| | * When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-0/+16
| | | | | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| * | Push source_type and polymorphic conditions out of ThroughAssociation and ↵Jon Leighton2011-03-051-2/+2
| | | | | | | | | | | | JoinDependency::JoinAssociation and into the reflection instead.
| * | Add a test for STI on the through where the through is nested, and change ↵Jon Leighton2011-03-054-0/+21
| | | | | | | | | | | | the code which support this
| * | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-041-0/+16
| | | | | | | | | | | | instantiate one AR object per actual record in the database. (Even when IM is off.)
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04100-1068/+3354
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'master' into nested_has_many_throughJon Leighton2010-12-1227-95/+363
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-2721-79/+508
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-1732-182/+299
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/test/cases/associations/has_many_through_associations_test.rb
| * \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-0813-61/+79
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb
| * | | | | | Update new tests in cascaded_eager_loading_test.rb to work with the modified ↵Jon Leighton2010-10-311-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures in this branch
| * | | | | | Fix bug with 0bb85ed9ffa9808926b46e8f7e59cab5b85ac19f which missed out a ↵Jon Leighton2010-10-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixtures declaration in cascaded_eager_loading_test.rb
| * | | | | | Fix naughty trailing whitespaceJon Leighton2010-10-3114-126/+126
| | | | | | |
| * | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-315-0/+45
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/through_association_scope.rb
| * \ \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-2821-83/+422
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/test/schema/schema.rb
| * | | | | | | | Rename nested_has_many_through_associations_test.rb because it does not only ↵Jon Leighton2010-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concern has_many associations
| * | | | | | | | Add explicit ordering in relations_test.rb, as the lack of this was causing ↵Jon Leighton2010-10-191-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | failures against postgres
| * | | | | | | | Add explicit ordering to nested_has_many_through_associations_test.rb as ↵Jon Leighton2010-10-191-32/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this was causing failures under postgres
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-193-14/+38
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-191-5/+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.rbJon Leighton2010-10-194-0/+67
| | | | | | | | | |
| * | | | | | | | | Fix broken testJon Leighton2010-10-191-1/+5
| | | | | | | | | |
| * | | | | | | | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-195-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association
| * | | | | | | | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-197-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association, where the source is a has_one or has_many
| * | | | | | | | | Respect the :primary_key option on the through_reflection of (non-nested) ↵Jon Leighton2010-10-196-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through associations
| * | | | | | | | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-1913-22/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through association
| * | | | | | | | | Make sure nested through associations are read onlyJon Leighton2010-10-151-0/+42
| | | | | | | | | |
| * | | | | | | | | Add assertions for nested through associations loaded by includes with ↵Jon Leighton2010-10-151-81/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conditions (uses the single-query strategy). Currently one failure to fix.
| * | | | | | | | | Support preloading nested through associations (using the default ↵Jon Leighton2010-10-151-61/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multi-query strategy)
| * | | | | | | | | Remove unnecessary requires from nested_has_many_through_associations_test.rbJon Leighton2010-10-141-6/+0
| | | | | | | | | |
| * | | | | | | | | Add test_has_one_through_has_one_through_with_belongs_to_source_reflectionJon Leighton2010-10-147-4/+31
| | | | | | | | | |
| * | | | | | | | | Add test_has_many_through_belongs_to_with_has_many_through_source_reflection ↵Jon Leighton2010-10-142-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (which already passes)
| * | | | | | | | | Add test_has_many_through_has_many_through_with_belongs_to_source_reflection ↵Jon Leighton2010-10-142-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (which already works)
| * | | | | | | | | Added ↵Jon Leighton2010-10-144-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
| * | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1413-41/+331
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
| * | | | | | | | | | Add ↵Jon Leighton2010-10-132-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work
| * | | | | | | | | | First bit of support for habtm in through assocs - ↵Jon Leighton2010-10-134-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes
| * | | | | | | | | | Add a commented, failing test for using a habtm in a has many through ↵Jon Leighton2010-10-124-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association. I want to refactor how aliasing works first.
| * | | | | | | | | | Add test_has_many_through_has_one_through_with_has_many_source_reflectionJon Leighton2010-10-122-1/+19
| | | | | | | | | | |
| * | | | | | | | | | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-124-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
| * | | | | | | | | | Rename some tests for consistencyJon Leighton2010-10-121-3/+3
| | | | | | | | | | |
| * | | | | | | | | | Add test_has_many_through_has_one_throughJon Leighton2010-10-122-2/+17
| | | | | | | | | | |
| * | | | | | | | | | Support has_one through assocs as the source associationJon Leighton2010-10-126-10/+50
| | | | | | | | | | |
| * | | | | | | | | | A load of tests that need to be writtenJon Leighton2010-10-121-0/+63
| | | | | | | | | | |
| * | | | | | | | | | Add support for nested through associations in JoinAssociation. Hence ↵Jon Leighton2010-10-099-5/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foo.joins(:bar) will work for through associations. There is some duplicated code now, which will be refactored.
| * | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-065-1/+51
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Refactoring JoinDependency and friends. This improves the code (IMO) ↵Jon Leighton2010-10-067-12/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | A failing test for a nested has many through association loaded via ↵Jon Leighton2010-10-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foo.joins(:bar)
| * | | | | | | | | | | Fix the tests (I have actually verified that these are also the 'right' ↵Jon Leighton2010-10-036-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes, rather than just making the tests pass again)
| * | | | | | | | | | | Add support for table aliasing, with a test that needs aliasing in order to ↵Jon Leighton2010-10-026-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work correctly. This test incidentally provides a more complicated test case (4 inner joins, 2 using polymorphism).
| * | | | | | | | | | | Integrate nested support into ThroughAssociationScope, using my concept of ↵Jon Leighton2010-10-021-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.