aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/models/member.rb
Commit message (Collapse)AuthorAgeFilesLines
* Don't use select() values from the join model of a through association. ↵Jon Leighton2011-05-111-0/+2
| | | | Fixes #508.
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-2/+9
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Has many through - It is not necessary to manually merge in the conditions ↵Jon Leighton2011-01-301-0/+3
| | | | | | | | hash for the through record, because the creation is done directly on the through association, which will already handle setting the conditions.
| * Verify that has_one :through preload respects the :conditions [#2976 ↵Will Bryant2010-12-231-0/+1
| | | | | | | | state:resolved]
| * Don't allow a has_one association to go :through a collection association ↵Jon Leighton2010-12-231-3/+6
| | | | | | | | [#2976 state:resolved]
* | Fix naughty trailing whitespaceJon Leighton2010-10-311-4/+4
| |
* | Add test_has_one_through_has_one_through_with_belongs_to_source_reflectionJon Leighton2010-10-141-0/+2
| |
* | Add test_has_many_through_has_one_through_with_has_many_source_reflectionJon Leighton2010-10-121-0/+1
| |
* | Adding test_has_many_through_has_one_with_has_many_through_source_reflection ↵Jon Leighton2010-10-121-0/+2
| | | | | | | | and modifying ThroughAssociationScope to make it work correctly.
* | Add test_has_many_through_has_one_throughJon Leighton2010-10-121-0/+3
| |
* | Support has_one through assocs as the source associationJon Leighton2010-10-121-1/+4
|/
* Fix preloading of has_one :through associations on belongs_to [#1507 ↵Matt Jones2008-12-181-0/+1
| | | | | | state:resolved] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* fix assignment to has_one :through associations.Matt Jones2008-11-151-0/+2
| | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Add has_one :through support, finally. Closes #4756 [thechrisoshow]Rick Olson2008-03-211-0/+9
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9067 5ecf4fe2-1ee6-0310-87b1-e25e094e27de