Browse files

Replace reset_counter_cache with reset_counters that has API inline w…

…ith existing update_counters method

[#1211 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
  • Loading branch information...
1 parent ccb197b commit 43d2cb8e93e7ff3da4d5b4e3c25272b27812adfc @gtd gtd committed with jeremy Dec 2, 2009
Showing with 16 additions and 11 deletions.
  1. +1 −1 activerecord/CHANGELOG
  2. +13 −8 activerecord/lib/active_record/base.rb
  3. +2 −2 activerecord/test/cases/base_test.rb
View
2 activerecord/CHANGELOG
@@ -2,7 +2,7 @@
* MySQL: add_ and change_column support positioning. #3286 [Ben Marini]
-* Reset your Active Record counter caches with the reset_counter_cache class method. #1211 [Mike Breen]
+* Reset your Active Record counter caches with the reset_counter_cache class method. #1211 [Mike Breen, Gabe da Silveira]
*2.3.5 (November 25, 2009)*
View
21 activerecord/lib/active_record/base.rb
@@ -916,20 +916,25 @@ def count_by_sql(sql)
connection.select_value(sql, "#{name} Count").to_i
end
- # Reset a counter cache for all records.
+ # Resets one or more counter caches to their correct value using an SQL
+ # count query. This is useful when adding new counter caches, or if the
+ # counter has been corrupted or modified directly by SQL.
#
# ==== Parameters
#
- # * +association_name+ - The name of of the association counter cache to reset
+ # * +id+ - The id of the object you wish to reset a counter on.
+ # * +counters+ - One or more counter names to reset
#
# ==== Examples
- # # For all Post records reset the comments_count
- # Post.reset_counter_cache(:comments)
- def reset_counter_cache(association)
- child_class = reflect_on_association(association).klass
- counter_name = child_class.reflect_on_association(self.name.downcase.to_sym).counter_cache_column
+ #
+ # # For Post with id #1 records reset the comments_count
+ # Post.reset_counters(1, :comments)
+ def reset_counters(id, *counters)
+ object = find(id)
+ counters.each do |association|
+ child_class = reflect_on_association(association).klass
+ counter_name = child_class.reflect_on_association(self.name.downcase.to_sym).counter_cache_column
- find_each do |object|
connection.update("UPDATE #{quoted_table_name} SET #{connection.quote_column_name(counter_name)} = #{object.send(association).count} WHERE #{connection.quote_column_name(primary_key)} = #{quote_value(object.id)}", "#{name} UPDATE")
end
end
View
4 activerecord/test/cases/base_test.rb
@@ -627,13 +627,13 @@ def test_decrement_counter
assert_equal -2, Topic.find(2).replies_count
end
- def test_reset_counter_cache
+ def test_reset_counters
assert_equal 1, Topic.find(1).replies_count
Topic.increment_counter("replies_count", 1)
assert_equal 2, Topic.find(1).replies_count
- Topic.reset_counter_cache(:replies)
+ Topic.reset_counters(1, :replies)
assert_equal 1, Topic.find(1).replies_count
end

1 comment on commit 43d2cb8

@granth

The method name should be changed to reset_counters here, too.

Please sign in to comment.