Browse files

Revert "Fix: counter_cache should decrement on deleting associated re…

…cords."

[#1196 state:open]

This reverts commit 757e436.
  • Loading branch information...
1 parent 757e436 commit 5b290082cf91e130af4da989d6bafc69d8f2607a @jeremy jeremy committed Dec 10, 2008
View
3 activerecord/lib/active_record/associations/association_collection.rb
@@ -139,9 +139,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
View
20 activerecord/test/cases/associations/has_many_associations_test.rb
@@ -536,18 +536,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")
@@ -601,14 +589,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
View
15 activerecord/test/cases/associations/has_many_through_associations_test.rb
@@ -2,10 +2,6 @@
require 'models/post'
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
@@ -85,17 +81,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)}

0 comments on commit 5b29008

Please sign in to comment.