1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Adds test to check that circular preloading does not modify Model.unscoped (as described in #5667)

This commit is contained in:
Benedikt Deicke 2012-04-03 21:13:24 +02:00
parent 68677ffb82
commit 402576b044
3 changed files with 8 additions and 4 deletions

View file

@ -1174,6 +1174,12 @@ class EagerAssociationTest < ActiveRecord::TestCase
assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) } assert_equal Comment.find(1), Comment.preload(:post => :comments).scoping { Comment.find(1) }
end 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 test "preload ignores the scoping" do
assert_equal( assert_equal(
Comment.find(1).post, Comment.find(1).post,

View file

@ -1099,10 +1099,6 @@ class RelationTest < ActiveRecord::TestCase
assert_equal 'honda', FastCar.unscoped { FastCar.order_using_old_style.limit(1).first.name} assert_equal 'honda', FastCar.unscoped { FastCar.order_using_old_style.limit(1).first.name}
end end
def test_unscoped_relation_clones
assert_not_equal CoolCar.unscoped.object_id, CoolCar.unscoped.object_id
end
def test_intersection_with_array def test_intersection_with_array
relation = Author.where(:name => "David") relation = Author.where(:name => "David")
rails_author = relation.first rails_author = relation.first

View file

@ -9,6 +9,8 @@ class Comment < ActiveRecord::Base
belongs_to :post, :counter_cache => true belongs_to :post, :counter_cache => true
has_many :ratings has_many :ratings
belongs_to :first_post, :foreign_key => :post_id
has_many :children, :class_name => 'Comment', :foreign_key => :parent_id has_many :children, :class_name => 'Comment', :foreign_key => :parent_id
belongs_to :parent, :class_name => 'Comment', :counter_cache => :children_count belongs_to :parent, :class_name => 'Comment', :counter_cache => :children_count