From 1166d49f62ccab789be208112163ad13183224e2 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 18 Apr 2012 19:27:04 -0700 Subject: Revert "Fix #5667. Preloading should ignore scoping." Causes a subtle regression where record.reload includes the default scope. Hard to reproduce in isolation. Seems like the relation is getting infected by some previous usage. This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e. --- activerecord/test/cases/associations/eager_test.rb | 11 ----------- 1 file changed, 11 deletions(-) (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 28bf1c60e5..1dc71ac4cc 100644 --- a/activerecord/test/cases/associations/eager_test.rb +++ b/activerecord/test/cases/associations/eager_test.rb @@ -1095,15 +1095,4 @@ 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