counter_culture 3.13.2 → 3.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcb5f1c57a5fda38de103fdcdf767e990f507b994c1d2e59debdbde0b1f3ef3
-  data.tar.gz: 8945d83862559fb693b79d1837507c23f978828e3d9c377f2d4cacf67d4843cc
+  metadata.gz: 5c24eb92adf8139552bb89de6d5f39f41f1fc46b89a9b23f66309385ab31cb6f
+  data.tar.gz: b3ec3a46a8bcaa1520b193a47909d3233c0193958849caac5cbe580acc621316
 SHA512:
-  metadata.gz: 398000f43d6feb9165c54ec2e3614b65bb9f384e8c8f9693d6956ee9e22d2e2eec6bad28b7cdab21b1fd2543fbee05f3f04d7f697a60a740fbdd00e20e960d9b
-  data.tar.gz: 7a8e5b137d1266161ff9cb3569005f2acd147829656fc66b1aabcb0bf0d3e0a823bc3398b0b6573c6b01e394f996436a53861949e09560ca5219b414ad67193b
+  metadata.gz: fd20102f237e5a2a3757567339afb5c60d5ef87e6d97c411a2e51a365749e1e45482a63553d631bf8337cbce997d657c708a34a7bf8a4a7d84b87dfd77d241b8
+  data.tar.gz: 533d50714673ce1e209db0e7ebbf29717668783014d3753d15306f6e0705c042a50821602ca948ed1444ec5adc76799c059e5735c5db0f416b6664f4fc414459

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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:

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/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.2'.freeze
+  VERSION = '3.13.3'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.13.2
+  version: 3.13.3
 platform: ruby
 authors:
 - Magnus von Koeller