fix `reset_counters` to work even with complex class names

e.g. it guesses that a belongs_to association to Namespace::MyModel is
named "my_model", unlike before where it would look up an association
named "namespace::mymodel" and fail.

1 files changed, 6 insertions, 4 deletions

diff --git a/activerecord/lib/active_record/counter_cache.rb b/activerecord/lib/active_record/counter_cache.rb
index 3bdb6970f8..9601ed6afd 100644
--- a/activerecord/lib/active_record/counter_cache.rb
+++ b/activerecord/lib/active_record/counter_cache.rb
@@ -16,13 +16,15 @@ module ActiveRecord
     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
+        child_class = reflect_on_association(association.to_sym).klass
+        belongs_name = self.name.demodulize.underscore.to_sym
+        counter_name = child_class.reflect_on_association(belongs_name).counter_cache_column
 
-        self.unscoped.where(arel_table[self.primary_key].eq(object.id)).arel.update(
+        self.unscoped.where(arel_table[self.primary_key].eq(object.id)).arel.update({
           arel_table[counter_name] => object.send(association).count
-        )
+        })
       end
+      return true
     end
 
     # A generic "counter updater" implementation, intended primarily to be