aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-19 04:33:42 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-02-19 04:33:42 -0800
commitb4e053e867232e28c7b99b0d935161d1e4559ced (patch)
treef73e5e490d1e5de640f83797a2b19325e2f82fb5 /activerecord/test/cases/associations/eager_test.rb
parent46b65ba274bea6f8d52926e4b243db28d6377fc0 (diff)
parent587f563c40cfada296d6e8d6bbe3c4d7fc6ce93b (diff)
downloadrails-b4e053e867232e28c7b99b0d935161d1e4559ced.tar.gz
rails-b4e053e867232e28c7b99b0d935161d1e4559ced.tar.bz2
rails-b4e053e867232e28c7b99b0d935161d1e4559ced.zip
Merge pull request #9322 from senny/backport_9252
don't cache invalid subsets when preloading hmt associations.
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index 20c6b691fc..5d07ffa241 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1112,4 +1112,10 @@ class EagerAssociationTest < ActiveRecord::TestCase
Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first
end
end
+
+ test "preloading does not cache has many association subset when preloaded with a through association" do
+ author = Author.includes(:comments_with_order_and_conditions, :posts).first
+ 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
end