aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/associations/eager_test.rb
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2012-06-01 03:03:50 +0100
committerAndrew White <andyw@pixeltrix.co.uk>2012-06-01 03:03:50 +0100
commit7056079761eba049bbc6108946a1626fe169dbdf (patch)
tree6f55bdc0521a3dd521cb2776da07d927236203cf /activerecord/test/cases/associations/eager_test.rb
parent4df968071436a4585c8e4694efecfabb02f1a806 (diff)
downloadrails-7056079761eba049bbc6108946a1626fe169dbdf.tar.gz
rails-7056079761eba049bbc6108946a1626fe169dbdf.tar.bz2
rails-7056079761eba049bbc6108946a1626fe169dbdf.zip
Restore behavior of Active Record 3.2.3 scopes
A series of commits relating to preloading and scopes caused a regression. Cloning the relation calls initialize_copy which resets a number of instance variables to nil. Without this the scope thinks that it is already loaded when it is called again. Reverts the following commits: 13f1401a6cf0266a3b0a91b173f976db2d4e50f3 8491740ca5361ba9df20e1c8b906c709f5bfbc12 dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e Fixes #6575, #6576 & #6577
Diffstat (limited to 'activerecord/test/cases/associations/eager_test.rb')
-rw-r--r--activerecord/test/cases/associations/eager_test.rb24
1 files changed, 0 insertions, 24 deletions
diff --git a/activerecord/test/cases/associations/eager_test.rb b/activerecord/test/cases/associations/eager_test.rb
index d7af07f9c7..1dc71ac4cc 100644
--- a/activerecord/test/cases/associations/eager_test.rb
+++ b/activerecord/test/cases/associations/eager_test.rb
@@ -1095,28 +1095,4 @@ class EagerAssociationTest < ActiveRecord::TestCase
Post.includes(:comments).order(nil).where(:comments => {:body => "Thank you for the welcome"}).first
end
end
-
- def test_deep_including_through_habtm
- posts = Post.find(:all, :include => {:categories => :categorizations}, :order => "posts.id, categories.id")
- assert_no_queries { assert_equal 2, posts[0].categories[0].categorizations.length }
- assert_no_queries { assert_equal 1, posts[0].categories[1].categorizations.length }
- assert_no_queries { assert_equal 2, posts[1].categories[0].categorizations.length }
- end
-
- test "scoping with a circular preload" do
- assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) }
- end
-
- test "circular preload does not modify unscoped" do
- expected = FirstPost.unscoped.find(2)
- FirstPost.preload(:comments => :first_post).find(1)
- assert_equal expected, FirstPost.unscoped.find(2)
- 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