diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-03-22 07:14:17 -0700 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-03-22 07:14:17 -0700 |
| commit | ae2baab1aa278c065dc742a3ffe65c65a7b87dc9 (patch) | |
| tree | 6a6fd983c2590c53661d8e0f9e5612968ba28659 /activerecord/test/cases | |
| parent | 69599b63de927091faf1d804b6457f65014080d6 (diff) | |
| parent | c8edd4fda45bbc7c99beaaf2d53f4de59c3fac54 (diff) | |
| download | rails-ae2baab1aa278c065dc742a3ffe65c65a7b87dc9.tar.gz rails-ae2baab1aa278c065dc742a3ffe65c65a7b87dc9.tar.bz2 rails-ae2baab1aa278c065dc742a3ffe65c65a7b87dc9.zip | |
Merge pull request #9870 from senny/9806_eager_loading_regression
do not reset associations when preloading twice.
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 944f135153..490aafa86d 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1118,4 +1118,11 @@ class EagerAssociationTest < ActiveRecord::TestCase assert_no_queries { assert_equal 2, author.comments_with_order_and_conditions.size } assert_no_queries { assert_equal 5, author.posts.size, "should not cache a subset of the association" } end + + test "preloading a through association twice does not reset it" do + members = Member.includes(current_membership: :club).includes(:club).to_a + assert_no_queries { + assert_equal 3, members.map(&:current_membership).map(&:club).size + } + end end |