提交 b30ae197 编写于 作者: J Jeremy Kemper

Revert "Fix: counter_cache should decrement on deleting associated records."

[#1196 state:open]

This reverts commit 05f21837.
上级 96b815d7
......@@ -202,9 +202,6 @@ def delete(*records)
records.each do |record|
@target.delete(record)
if respond_to?(:cached_counter_attribute_name) && @owner[cached_counter_attribute_name]
@owner.class.decrement_counter(cached_counter_attribute_name, @owner.send(@owner.class.primary_key))
end
callback(:after_remove, record)
end
end
......
......@@ -552,18 +552,6 @@ def test_deleting
assert_equal 0, companies(:first_firm).clients_of_firm(true).size
end
def test_deleting_updates_counter_cache
post = Post.first
post.comments.delete(post.comments.first)
post.reload
assert_equal post.comments(true).size, post.comments_count
post.comments.delete(post.comments.first)
post.reload
assert_equal 0, post.comments_count
end
def test_deleting_before_save
new_firm = Firm.new("name" => "A New Firm, Inc.")
new_client = new_firm.clients_of_firm.build("name" => "Another Client")
......@@ -617,14 +605,6 @@ def test_clearing_an_association_collection
end
end
def test_clearing_updates_counter_cache
post = Post.first
post.comments.clear
post.reload
assert_equal 0, post.comments_count
end
def test_clearing_a_dependent_association_collection
firm = companies(:first_firm)
client_id = firm.dependent_clients_of_firm.first.id
......
......@@ -3,9 +3,6 @@
require 'models/person'
require 'models/reader'
require 'models/comment'
require 'models/tag'
require 'models/tagging'
require 'models/author'
class HasManyThroughAssociationsTest < ActiveRecord::TestCase
fixtures :posts, :readers, :people, :comments, :authors
......@@ -87,17 +84,6 @@ def test_delete_association
assert posts(:welcome).reload.people(true).empty?
end
def test_deleting_updates_counter_cache
taggable = Tagging.first.taggable
taggable.taggings.push(Tagging.new)
taggable.reload
assert_equal 1, taggable.taggings_count
taggable.taggings.delete(taggable.taggings.first)
taggable.reload
assert_equal 0, taggable.taggings_count
end
def test_replace_association
assert_queries(4){posts(:welcome);people(:david);people(:michael); posts(:welcome).people(true)}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册