aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Add a test for STI on the through where the through is nested, and change ↵Jon Leighton2011-03-056-13/+46
| | | | | | | | | | | | | | | | the code which support this
| * | | Stop identity-mapping the through records in the preloader since I fixed the ↵Jon Leighton2011-03-041-5/+0
| | | | | | | | | | | | | | | | underlying problem in the habtm preloader.
| * | | Fix a couple of tests in join_model_test.rb which were failing when the ↵Jon Leighton2011-03-041-2/+2
| | | | | | | | | | | | | | | | identity map is turned off
| * | | When preloading has_and_belongs_to_many associations, we should only ↵Jon Leighton2011-03-042-2/+20
| | | | | | | | | | | | | | | | 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-045-9/+28
| |\| |
| * | | Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-04584-13369/+18299
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-12149-1249/+2445
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-27171-1857/+3057
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/associations.rb
| * \ \ \ \ \ Merge branch 'master' into nested_has_many_throughJon Leighton2010-11-17196-1793/+3968
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0852-185/+381
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3121-259/+259
| | | | | | | | |
| * | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-3116-43/+121
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-28116-632/+6546
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | Remove obsolete require to active_record/associations/nested_has_many_throughJon Leighton2010-10-191-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Fix typoJon Leighton2010-10-191-1/+1
| | | | | | | | | | |
| * | | | | | | | | | Remove obsolete autoloadJon Leighton2010-10-191-1/+0
| | | | | | | | | | |
| * | | | | | | | | | Add a CHANGELOG entry about nested through associationsJon Leighton2010-10-191-0/+2
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-1967-1408/+2386
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add some API documentation about nested through associationsJon Leighton2010-10-191-8/+52
| | | | | | | | | | | |
| * | | | | | | | | | | Add some comments for ThroughReflection#through_reflection_chainJon Leighton2010-10-191-1/+10
| | | | | | | | | | | |
| * | | | | | | | | | | Remove various comments and code which were just being used during the ↵Jon Leighton2010-10-195-199/+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-195-2/+80
| | | | | | | | | | | |
| * | | | | | | | | | | Fix broken testJon Leighton2010-10-191-1/+5
| | | | | | | | | | | |
| * | | | | | | | | | | Small refactoringJon Leighton2010-10-191-6/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Support the :primary_key option on a through reflection in a nested through ↵Jon Leighton2010-10-196-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | association
| * | | | | | | | | | | Bugfix/refactoringJon Leighton2010-10-193-11/+20
| | | | | | | | | | | |
| * | | | | | | | | | | Remove unused methodsJon Leighton2010-10-191-11/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Support for :primary_key option on the source reflection of a through ↵Jon Leighton2010-10-1910-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-199-11/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through associations
| * | | | | | | | | | | Properly support conditions on any of the reflections involved in a nested ↵Jon Leighton2010-10-1916-98/+235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | through association
| * | | | | | | | | | | Refactoring: replace the mix of variables like @finder_sql, @counter_sql, ↵Jon Leighton2010-10-1711-154/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etc with just a single scope hash (created on initialization of the proxy). This is now used consistently across all associations. Therefore, all you have to do to ensure finding/counting etc is done correctly is implement the scope correctly.
| * | | | | | | | | | | Make sure nested through associations are read onlyJon Leighton2010-10-156-9/+82
| | | | | | | | | | | |
| * | | | | | | | | | | Fix small bug which was shown by the last commitJon Leighton2010-10-151-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | 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-152-122/+216
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-145-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_many_with_has_many_through_habtm_source_reflection and make it pass
| * | | | | | | | | | | Fix bug in previous refactoringJon Leighton2010-10-141-6/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into nested_has_many_throughJon Leighton2010-10-14160-1320/+8646
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/associations.rb activerecord/test/cases/associations/cascaded_eager_loading_test.rb
| * | | | | | | | | | | | Add ↵Jon Leighton2010-10-133-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_and_belongs_to_many_with_has_many_source_reflection and make it work
| * | | | | | | | | | | | Refactoring ThroughAssociationScope#construct_through_joinsJon Leighton2010-10-131-54/+62
| | | | | | | | | | | | |
| * | | | | | | | | | | | First bit of support for habtm in through assocs - ↵Jon Leighton2010-10-136-30/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_has_many_through_has_many_with_has_and_belongs_to_many_source_reflection now passes
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-24 21:41:27 +0000