Jon Leighton
|
1dd90f8f12
|
Don't use select() values from the join model of a through association. Fixes #508.
|
2011-05-11 08:56:01 +01:00 |
|
Jon Leighton
|
735844db71
|
Merge branch 'master' into nested_has_many_through
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
|
2011-03-04 09:30:27 +00:00 |
|
Jon Leighton
|
3fa61ccb9e
|
Has many through - It is not necessary to manually merge in the conditions hash for the through record, because the creation is done directly on the through association, which will already handle setting the conditions.
|
2011-01-30 11:58:09 +00:00 |
|
Will Bryant
|
b79823832e
|
Verify that has_one :through preload respects the :conditions [#2976 state:resolved]
|
2010-12-23 15:19:17 -08:00 |
|
Jon Leighton
|
c6db37e69b
|
Don't allow a has_one association to go :through a collection association [#2976 state:resolved]
|
2010-12-23 15:19:17 -08:00 |
|
Jon Leighton
|
9a1a32ac2b
|
Fix naughty trailing whitespace
|
2010-10-31 11:21:28 +00:00 |
|
Jon Leighton
|
002985fb66
|
Add test_has_one_through_has_one_through_with_belongs_to_source_reflection
|
2010-10-14 13:44:32 +01:00 |
|
Jon Leighton
|
56064aa4b0
|
Add test_has_many_through_has_one_through_with_has_many_source_reflection
|
2010-10-12 17:32:52 +01:00 |
|
Jon Leighton
|
dc39aceb94
|
Adding test_has_many_through_has_one_with_has_many_through_source_reflection and modifying ThroughAssociationScope to make it work correctly.
|
2010-10-12 17:27:10 +01:00 |
|
Jon Leighton
|
6a016a5511
|
Add test_has_many_through_has_one_through
|
2010-10-12 16:53:22 +01:00 |
|
Jon Leighton
|
1777600e6e
|
Support has_one through assocs as the source association
|
2010-10-12 16:40:24 +01:00 |
|
Matt Jones
|
a9422cc1db
|
Fix preloading of has_one :through associations on belongs_to [#1507 state:resolved]
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
|
2008-12-18 19:19:36 +00:00 |
|
Matt Jones
|
d3fd997109
|
fix assignment to has_one :through associations.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
|
2008-11-15 18:20:39 +01:00 |
|
Rick Olson
|
273b21faa9
|
Add has_one :through support, finally. Closes #4756 [thechrisoshow]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9067 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
|
2008-03-21 18:09:03 +00:00 |