From dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e Mon Sep 17 00:00:00 2001 From: Jon Leighton Date: Fri, 30 Mar 2012 16:18:39 +0100 Subject: Fix #5667. Preloading should ignore scoping. Conflicts: activerecord/test/cases/associations/eager_test.rb --- activerecord/test/cases/associations/eager_test.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'activerecord/test/cases/associations') diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb index 1dc71ac4cc..28bf1c60e5 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1095,4 +1095,15 @@ class EagerAssociationTest < ActiveRecord::TestCase Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first end end + + test "scoping with a circular preload" do + assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) } + end + + test "preload ignores the scoping" do + assert_equal( + Comment.find(1).post, + Post.where('1 = 0').scoping { Comment.preload(:post).find(1).post } + ) + end end -- cgit v1.2.3