counter_culture 3.13.1 → 3.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9731db7c2d482e50fef56c6bac5e7c9e1697ac1f2f4f20ff9bb819088d77e843
-  data.tar.gz: 1fd97cbd3f4642eb8ff9ae375e1d50d244f1e0f034fe2fcd72e0593cd03641f5
+  metadata.gz: 5c24eb92adf8139552bb89de6d5f39f41f1fc46b89a9b23f66309385ab31cb6f
+  data.tar.gz: b3ec3a46a8bcaa1520b193a47909d3233c0193958849caac5cbe580acc621316
 SHA512:
-  metadata.gz: f38aec03d1ad8259e26f26a6b51301e01f34a3ccc88c11086b0bc26eeecbfbd423c6e58913e1315918eb50368c3a07b50d22f5f3463ed673749e5ebc1df237ba
-  data.tar.gz: 6f277537ab3465cf2e3ec6fdef625f611ba55cfc7285c438a6e0e8027dc634df84356004ec6c2569adb365ef95652cfb2f008b958c08948e2598dabce93015a1
+  metadata.gz: fd20102f237e5a2a3757567339afb5c60d5ef87e6d97c411a2e51a365749e1e45482a63553d631bf8337cbce997d657c708a34a7bf8a4a7d84b87dfd77d241b8
+  data.tar.gz: 533d50714673ce1e209db0e7ebbf29717668783014d3753d15306f6e0705c042a50821602ca948ed1444ec5adc76799c059e5735c5db0f416b6664f4fc414459

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 3.13.3 (June 25, 2026)
+
+Bugfixes:
+  - Fix `counter_culture_fix_counts` raising a SQL syntax error for counter caches stored in reserved-word columns (e.g. `order`) by quoting identifiers in the reconciler (#434)
+
+## 3.13.2 (June 25, 2026)
+
+Bugfixes:
+  - Fix multi-level counter caches not being updated in memory when creating or destroying records (#432)
+
 ## 3.13.1 (April 20, 2026)
 
 Bugfixes:

data/README.md

@@ -1,4 +1,4 @@
-# counter_culture [![Build Status](https://circleci.com/gh/magnusvk/counter_culture/tree/master.svg?style=svg)](https://circleci.com/gh/magnusvk/counter_culture/tree/master)
+# counter_culture [![Build Status](https://circleci.com/gh/magnusvk/counter_culture/tree/main.svg?style=svg)](https://circleci.com/gh/magnusvk/counter_culture/tree/main)
 
 Turbo-charged counter caches for your Rails app. Huge improvements over the Rails standard counter caches:
 

data/lib/counter_culture/counter.rb

@@ -410,9 +410,7 @@ module CounterCulture
 
     # update associated object counter attribute
     def assign_to_associated_object(obj, relation, change_counter_column, operator, delta_magnitude)
-      association_name = relation_reflect(relation).name
-
-      association_object = association_object_for_assign(obj, association_name)
+      association_object = association_object_for_assign(obj, relation)
       return if association_object.blank? || association_object.frozen?
 
       association_object.assign_attributes(
@@ -422,21 +420,23 @@ module CounterCulture
       association_object_clear_change(association_object, change_counter_column)
     end
 
-    def association_object_for_assign(obj, association_name)
-      if obj.class.reflect_on_all_associations.
-          find { |assoc| assoc.name.to_sym == association_name.to_sym }.
-          blank?
-        # This means that this isn't defined as an association; either it
-        # doesn't exist at all, or it uses delegate. In either case, we can't
-        # update the count this way.
-        return
-      end
-      if !obj.association(association_name).loaded?
-        # If the association isn't loaded, no need to update the count
-        return
+    def association_object_for_assign(obj, relation)
+      relation = relation.is_a?(Enumerable) ? relation.dup : [relation]
+
+      while !obj.nil? && relation.size > 0
+        cur_relation = relation.shift
+        # This isn't an association (e.g. it uses delegate), so we can't update the count this way
+        return nil if obj.class.reflect_on_association(cur_relation).nil?
+
+        if !obj.association(cur_relation).loaded?
+          # If the association isn't loaded, no need to update the count
+          return nil
+        end
+
+        obj = obj.public_send(cur_relation)
       end
 
-      obj.public_send(association_name)
+      obj
     end
 
     def association_object_clear_change(association_object, change_counter_column)

data/lib/counter_culture/reconciler.rb

@@ -108,13 +108,15 @@ module CounterCulture
           next unless column_name
 
           relation_class_table_name = quote_table_name(relation_class.table_name)
+          # quote the cache column so reserved-word/quoting-sensitive names work
+          quoted_column_name = quote_column_name(column_name)
 
           # select join column and count (from above) as well as cache column ('column_name') for later comparison
           counts_query = scope.select(
             "#{primary_key_select}, " \
             "#{association_primary_key_select}, " \
             "#{count_select} AS count, " \
-            "MAX(#{relation_class_table_name}.#{column_name}) AS #{column_name}"
+            "MAX(#{relation_class_table_name}.#{quoted_column_name}) AS #{quoted_column_name}"
           )
 
           # we need to join together tables until we get back to the table this class itself lives in
@@ -155,9 +157,20 @@ module CounterCulture
 
             track_change(record, column_name, count)
 
-            updates = []
-            # this updates the actual counter
-            updates << "#{column_name} = #{count}"
+            # Build a Hash of column => value updates and let Rails (Arel) qualify
+            # and escape the column names and cast/quote the values, consistent with
+            # the Arel-based updates used in Counter (see #425). This updates the
+            # actual counter.
+            updates = { column_name => count }
+
+            # Set lock_version = lock_version (no-op) to skip Rails auto-increment,
+            # just as Counter does (see #429); a Hash update_all would otherwise
+            # bump the optimistic locking column.
+            if relation_class.locking_enabled?
+              lock_column = relation_class.locking_column
+              updates[lock_column] = relation_class.arel_table[lock_column]
+            end
+
             # and here we update the timestamp, if so desired
             if options[:touch]
               current_time = record.send(:current_time_from_proper_timezone)
@@ -168,13 +181,13 @@ module CounterCulture
                 timestamp_columns << options[:touch]
               end
               timestamp_columns.each do |timestamp_column|
-                updates << "#{timestamp_column} = '#{current_time.to_formatted_s(:db)}'"
+                updates[timestamp_column] = current_time
               end
             end
 
             with_writing_db_connection do
               conditions = Array.wrap(relation_class.primary_key).map { |key| [key, record.send(key)] }.to_h
-              relation_class.where(conditions).distinct(false).update_all(updates.join(', '))
+              relation_class.where(conditions).distinct(false).update_all(updates)
             end
           end
         end
@@ -351,6 +364,12 @@ module CounterCulture
         end
       end
 
+      def quote_column_name(column_name)
+        @connection_handler.call do |connection|
+          connection.quote_column_name(column_name)
+        end
+      end
+
       def parameterize(string)
         if ACTIVE_RECORD_VERSION < Gem::Version.new("5.0")
           string.parameterize('_')

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '3.13.1'.freeze
+  VERSION = '3.13.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.13.3
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-04-20 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord