diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:18:39 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-03-30 16:24:41 +0100 |
commit | dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e (patch) | |
tree | 12d52e67f25c017fb96a1f116f757d6742ef8173 /activerecord/test/cases | |
parent | 13fe1903d89fa9345a9f0b17de2d31e8b7ef2b1d (diff) | |
download | rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.tar.gz rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.tar.bz2 rails-dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.zip |
Fix #5667. Preloading should ignore scoping.
Conflicts:
activerecord/test/cases/associations/eager_test.rb
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r-- | activerecord/test/cases/associations/eager_test.rb | 11 |
1 files changed, 11 insertions, 0 deletions
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 |