counter_culture 3.11.3 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75ac99d8d45f3e16859bb04854958dac048a449aa4afe94f12885cefe3a94787
-  data.tar.gz: e90d1b87ea3e2d919434dbeea2263fa5556044dc273cab21a6a67b423519c012
+  metadata.gz: 4d37272100e5c67ce47b96f522793380e863db895f97387ce02dcc609ae1cb24
+  data.tar.gz: 24580fa8abe60d089e5993e8a95c3c1740124ad058d5bdbba2c9766a83a635ba
 SHA512:
-  metadata.gz: dc1196535a528c5f87e39aca06d5e1a3e014f469c8aa3e8f01c56f75a59489c4db25dc9b67168b162ddf9ac24e45c55fe887c10176e76786dea5ffe72603f10b
-  data.tar.gz: a949a3856773028e954e00c8ce5ba89ac0e999230c47af3d1b0e312fdef827cbbf0dc71ed91406c6b2b77ba4d194b108f21df8b904f0e09592d2b5ef2a0e25d9
+  metadata.gz: 673ede183fe87f83356185732c651bf9a9348030b4daaee26ff63cb2774b09b08c0dadb720a5ac58d331586ae085bdbc558dba2000f6ef70e7f0ec781fdb6c46
+  data.tar.gz: 6df694a1661bc69582106cb429a557f4110cf7d2336534d33d7e64dce120e000489ec94a1c6982308593f9b1853ed0926cad63c6b09998293bf3139d01eaf93b

data/.circleci/config.yml

@@ -13,23 +13,17 @@ jobs:
       database:
         type: string
     docker:
-      - image: cimg/ruby:<< parameters.ruby-version >>
+      - image: ruby:<< parameters.ruby-version >>
       - image: cimg/postgres:14.1
       - image: cimg/mysql:8.0
     steps:
       - checkout
-      - run:
-          name: gem update --system --no-ri --no-rdoc
-          # bundles sporadically fail with a weird Psych error if I don't do
-          # this. It's annoying since it's slow but it's better than
-          # non-deterministic build failures.
-          command: sudo gem update --system
       - run:
           name: bundle update --no-ri --no-rdoc
           command: BUNDLE_GEMFILE=gemfiles/rails_<< parameters.rails-version >>.gemfile bundle update
       - run:
           name: install dockerize
-          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && sudo tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+          command: wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
           environment:
             DOCKERIZE_VERSION: v0.3.0
       - run:
@@ -48,124 +42,101 @@ workflows:
       - test:
           matrix:
             parameters:
-              ruby-version: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
-              rails-version: ["5.2", "6.0", "6.1", "7.0", "7.1", "7.2", "8.0"]
+              ruby-version: ["3.0", "3.1", "3.2", "3.3", "4.0"]
+              rails-version: ["6.0", "6.1", "7.0", "7.1", "7.2", "8.0", "8.1"]
               database: ["postgresql", "sqlite3", "mysql2"]
             exclude:
+              # Rails 7.2 requires Ruby 3.1+
               - ruby-version: "3.0"
-                rails-version: "5.2"
+                rails-version: "7.2"
                 database: "postgresql"
               - ruby-version: "3.0"
-                rails-version: "5.2"
+                rails-version: "7.2"
+                database: "sqlite3"
+              - ruby-version: "3.0"
+                rails-version: "7.2"
                 database: "mysql2"
+              # Rails 8.0 requires Ruby 3.2+
               - ruby-version: "3.0"
-                rails-version: "5.2"
+                rails-version: "8.0"
+                database: "postgresql"
+              - ruby-version: "3.0"
+                rails-version: "8.0"
                 database: "sqlite3"
+              - ruby-version: "3.0"
+                rails-version: "8.0"
+                database: "mysql2"
               - ruby-version: "3.1"
-                rails-version: "5.2"
+                rails-version: "8.0"
                 database: "postgresql"
               - ruby-version: "3.1"
-                rails-version: "5.2"
-                database: "mysql2"
-              - ruby-version: "3.1"
-                rails-version: "5.2"
+                rails-version: "8.0"
                 database: "sqlite3"
-              - ruby-version: "3.2"
-                rails-version: "5.2"
+              - ruby-version: "3.1"
+                rails-version: "8.0"
+                database: "mysql2"
+              # Rails 8.1 requires Ruby 3.2+
+              - ruby-version: "3.0"
+                rails-version: "8.1"
                 database: "postgresql"
-              - ruby-version: "3.2"
-                rails-version: "5.2"
+              - ruby-version: "3.0"
+                rails-version: "8.1"
+                database: "sqlite3"
+              - ruby-version: "3.0"
+                rails-version: "8.1"
                 database: "mysql2"
-              - ruby-version: "3.2"
-                rails-version: "5.2"
+              - ruby-version: "3.1"
+                rails-version: "8.1"
+                database: "postgresql"
+              - ruby-version: "3.1"
+                rails-version: "8.1"
                 database: "sqlite3"
-              - ruby-version: "3.3"
-                rails-version: "5.2"
+              - ruby-version: "3.1"
+                rails-version: "8.1"
+                database: "mysql2"
+              # Ruby 4.0 requires Rails 8.0+
+              - ruby-version: "4.0"
+                rails-version: "6.0"
                 database: "postgresql"
-              - ruby-version: "3.3"
-                rails-version: "5.2"
+              - ruby-version: "4.0"
+                rails-version: "6.0"
+                database: "sqlite3"
+              - ruby-version: "4.0"
+                rails-version: "6.0"
                 database: "mysql2"
-              - ruby-version: "3.3"
-                rails-version: "5.2"
+              - ruby-version: "4.0"
+                rails-version: "6.1"
+                database: "postgresql"
+              - ruby-version: "4.0"
+                rails-version: "6.1"
                 database: "sqlite3"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
+                rails-version: "6.1"
+                database: "mysql2"
+              - ruby-version: "4.0"
                 rails-version: "7.0"
                 database: "postgresql"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.0"
                 database: "sqlite3"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.0"
                 database: "mysql2"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.1"
                 database: "postgresql"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.1"
                 database: "sqlite3"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.1"
                 database: "mysql2"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.2"
                 database: "postgresql"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.2"
                 database: "sqlite3"
-              - ruby-version: "2.6"
+              - ruby-version: "4.0"
                 rails-version: "7.2"
                 database: "mysql2"
-              - ruby-version: "2.7"
-                rails-version: "7.2"
-                database: "postgresql"
-              - ruby-version: "2.7"
-                rails-version: "7.2"
-                database: "sqlite3"
-              - ruby-version: "2.7"
-                rails-version: "7.2"
-                database: "mysql2"
-              - ruby-version: "3.0"
-                rails-version: "7.2"
-                database: "postgresql"
-              - ruby-version: "3.0"
-                rails-version: "7.2"
-                database: "sqlite3"
-              - ruby-version: "3.0"
-                rails-version: "7.2"
-                database: "mysql2"
-              - ruby-version: "2.6"
-                rails-version: "8.0"
-                database: "postgresql"
-              - ruby-version: "2.6"
-                rails-version: "8.0"
-                database: "sqlite3"
-              - ruby-version: "2.6"
-                rails-version: "8.0"
-                database: "mysql2"
-              - ruby-version: "2.7"
-                rails-version: "8.0"
-                database: "postgresql"
-              - ruby-version: "2.7"
-                rails-version: "8.0"
-                database: "sqlite3"
-              - ruby-version: "2.7"
-                rails-version: "8.0"
-                database: "mysql2"
-              - ruby-version: "3.0"
-                rails-version: "8.0"
-                database: "postgresql"
-              - ruby-version: "3.0"
-                rails-version: "8.0"
-                database: "sqlite3"
-              - ruby-version: "3.0"
-                rails-version: "8.0"
-                database: "mysql2"
-              - ruby-version: "3.1"
-                rails-version: "8.0"
-                database: "postgresql"
-              - ruby-version: "3.1"
-                rails-version: "8.0"
-                database: "sqlite3"
-              - ruby-version: "3.1"
-                rails-version: "8.0"
-                database: "mysql2"

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 3.12.1 (January 6, 2026)
+
+Bugfixes:
+  - Fix Rails 8.1+ compatibility by using Arel-based updates to avoid ambiguous column errors with UPDATE...FROM syntax (#425)
+
+Changes:
+  - Dropped support for Ruby 2.6, 2.7 and Rails 5.2 (all EOL)
+  - Added support and testing for Ruby 4.0 and Rails 8.1 (#425)
+
+## 3.11.4 (November 5, 2025)
+
+Bugfixes:
+  - Fix counter cache not using the correct type with multiple STI models in the association chain (#421)
+
 ## 3.11.3 (October 22, 2025)
 
 Bugfixes:

data/README.md

@@ -7,7 +7,7 @@ Turbo-charged counter caches for your Rails app. Huge improvements over the Rail
 * Supports dynamic column names, making it possible to split up the counter cache for different types of objects
 * Can keep a running count, or a running total
 
-Tested against Ruby 2.6, 2.7, 3.0, 3.1, 3.2 and 3.3 and against the latest patch releases of Rails 5.2, 6.0, 6.1, 7.0, 7.1, 7.2 and 8.0.
+Tested against Ruby 3.0, 3.1, 3.2, 3.3 and 4.0 and against the latest patch releases of Rails 6.0, 6.1, 7.0, 7.1, 7.2, 8.0 and 8.1.
 
 Please note that -- unlike Rails' built-in counter-caches -- counter_culture does not currently change the behavior of the `.size` method on ActiveRecord associations. If you want to avoid a database query and read the cached value, please use the attribute name containing the counter cache directly.
 

data/gemfiles/rails_8.1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 8.1.0"
+
+gemspec path: "../"
+

data/lib/counter_culture/counter.rb

@@ -59,32 +59,20 @@ module CounterCulture
                           end
         return if delta_magnitude.zero?
 
-        # increment or decrement?
-        operator = options[:increment] ? '+' : '-'
-
         klass = relation_klass(relation, source: obj, was: options[:was])
 
-        # MySQL throws an ambiguous column error if any joins are present and we don't include the
-        # table name. We isolate this change to MySQL because sqlite has the opposite behavior and
-        # throws an exception if the table name is present after UPDATE.
-        quoted_column = WithConnection.new(klass).call do |connection|
-          if connection.adapter_name == 'Mysql2'
-            "#{klass.quoted_table_name}.#{connection.quote_column_name(change_counter_column)}"
-          else
-            "#{connection.quote_column_name(change_counter_column)}"
-          end
-        end
-
         column_type = klass.type_for_attribute(change_counter_column).type
 
-        # we don't use Rails' update_counters because we support changing the timestamp
-        updates = []
+        # Calculate signed delta for both paths
+        signed_delta = options[:increment] ? delta_magnitude : -delta_magnitude
 
-        # this will update the actual counter
-        updates << if column_type == :money
-          assemble_money_counter_update(klass, id_to_change, quoted_column, operator, delta_magnitude)
+        if Thread.current[:aggregate_counter_updates]
+          # Store structured data for later Arel assembly
+          remember_counter_update(klass, id_to_change, change_counter_column, signed_delta, column_type)
         else
-          assemble_counter_update(klass, id_to_change, quoted_column, operator, delta_magnitude)
+          # Build Arel expression for non-aggregate case
+          counter_expr = Counter.build_arel_counter_expr(klass, change_counter_column, signed_delta, column_type)
+          arel_updates = { change_counter_column => counter_expr }
         end
 
         # and this will update the timestamp, if so desired
@@ -97,12 +85,11 @@ module CounterCulture
             timestamp_columns << touch
           end
           timestamp_columns.each do |timestamp_column|
-            updates << assemble_timestamp_update(
-              klass,
-              id_to_change,
-              timestamp_column,
-              -> { klass.send(:current_time_from_proper_timezone).to_formatted_s(:db) }
-            )
+            if Thread.current[:aggregate_counter_updates]
+              remember_timestamp_update(klass, id_to_change, timestamp_column)
+            else
+              arel_updates[timestamp_column] = current_time
+            end
           end
         end
 
@@ -149,7 +136,9 @@ module CounterCulture
         unless Thread.current[:aggregate_counter_updates]
           execute_now_or_after_commit(obj) do
             conditions = primary_key_conditions(primary_key, id_to_change)
-            klass.where(conditions).update_all updates.join(', ')
+            # Use Arel-based updates which let Rails handle column qualification properly,
+            # avoiding ambiguous column errors in Rails 8.1+ UPDATE...FROM syntax.
+            klass.where(conditions).distinct(false).update_all(arel_updates)
             # Determine if we should update the in-memory counter on the associated object.
             # When updating the old counter (was: true), we need to carefully consider two scenarios:
             # 1) The belongs_to relation changed (e.g., moving a child from parent A to parent B):
@@ -171,6 +160,7 @@ module CounterCulture
             end
 
             if should_update_counter
+              operator = options[:increment] ? '+' : '-'
               assign_to_associated_object(obj, relation, change_counter_column, operator, delta_magnitude)
             end
           end
@@ -240,11 +230,11 @@ module CounterCulture
       Array.wrap(primary_key).map { |pk| value.try(pk&.to_sym) }.compact.presence
     end
 
-    # gets the reflect object on the given relation
+    # gets the reflect object on the given relation and the model that defines this reflect
     #
     # relation: a symbol or array of symbols; specifies the relation
     #   that has the counter cache column
-    def relation_reflect(relation)
+    def relation_reflect_and_model(relation)
       relation = relation.is_a?(Enumerable) ? relation.dup : [relation]
 
       # go from one relation to the next until we hit the last reflect object
@@ -262,7 +252,16 @@ module CounterCulture
         end
       end
 
-      return reflect
+      return [reflect, klass]
+    end
+
+
+    # gets the reflect object on the given relation
+    #
+    # relation: a symbol or array of symbols; specifies the relation
+    #   that has the counter cache column
+    def relation_reflect(relation)
+      relation_reflect_and_model(relation).first
     end
 
     # gets the class of the given relation
@@ -445,68 +444,47 @@ module CounterCulture
       (association_object.public_send(change_counter_column) || 0).public_send(operator, delta_magnitude)
     end
 
-    def assemble_money_counter_update(klass, id_to_change, quoted_column, operator, delta_magnitude)
-      counter_update_snippet(
-        "#{quoted_column} = COALESCE(CAST(#{quoted_column} as NUMERIC), 0)",
-        klass,
-        id_to_change,
-        operator,
-        delta_magnitude
-      )
-    end
-
-    def assemble_counter_update(klass, id_to_change, quoted_column, operator, delta_magnitude)
-      counter_update_snippet(
-        "#{quoted_column} = COALESCE(#{quoted_column}, 0)",
-        klass,
-        id_to_change,
-        operator,
-        delta_magnitude
-      )
-    end
-
-    def assemble_timestamp_update(klass, id_to_change, timestamp_column, value)
-      update = "#{timestamp_column} ="
-
-      if Thread.current[:aggregate_counter_updates]
-        remember_timestamp_update(klass, id_to_change, update, value)
-      else
-        "#{update} '#{value.call}'"
-      end
-    end
-
     def primary_key_conditions(primary_key, fk_value)
       Array.wrap(primary_key)
           .zip(Array.wrap(fk_value))
           .to_h
     end
 
-    def counter_update_snippet(update, klass, id_to_change, operator, delta_magnitude)
-      if Thread.current[:aggregate_counter_updates]
-        remember_counter_update(
-          klass,
-          id_to_change,
-          "#{update} +",
-          operator == '+' ? delta_magnitude : -delta_magnitude
+    # Builds an Arel expression for counter updates: COALESCE(col, 0) +/- delta
+    # This is a class method so it can be called from CounterCulture.aggregate_counter_updates
+    def self.build_arel_counter_expr(klass, column, delta, column_type)
+      arel_column = klass.arel_table[column]
+      arel_delta = Arel::Nodes.build_quoted(delta.abs)
+
+      coalesce = if column_type == :money
+        Arel::Nodes::NamedFunction.new(
+          'COALESCE',
+          [Arel::Nodes::NamedFunction.new('CAST', [arel_column.as('NUMERIC')]), 0]
         )
       else
-        "#{update} #{operator} #{delta_magnitude}"
+        Arel::Nodes::NamedFunction.new('COALESCE', [arel_column, 0])
+      end
+
+      if delta > 0
+        Arel::Nodes::Addition.new(coalesce, arel_delta)
+      else
+        Arel::Nodes::Subtraction.new(coalesce, arel_delta)
       end
     end
 
-    def remember_counter_update(klass, id, operation, value)
+    def remember_counter_update(klass, id, column, delta, column_type)
       Thread.current[:aggregated_updates][klass] ||= {}
-      Thread.current[:aggregated_updates][klass][id] ||= {}
-      Thread.current[:aggregated_updates][klass][id][operation] ||= 0
+      Thread.current[:aggregated_updates][klass][id] ||= { counters: {}, timestamps: [] }
+      Thread.current[:aggregated_updates][klass][id][:counters][column] ||= { delta: 0, type: column_type }
 
-      Thread.current[:aggregated_updates][klass][id][operation] += value
+      Thread.current[:aggregated_updates][klass][id][:counters][column][:delta] += delta
     end
 
-    def remember_timestamp_update(klass, id, operation, value)
+    def remember_timestamp_update(klass, id, column)
       Thread.current[:aggregated_updates][klass] ||= {}
-      Thread.current[:aggregated_updates][klass][id] ||= {}
+      Thread.current[:aggregated_updates][klass][id] ||= { counters: {}, timestamps: [] }
 
-      Thread.current[:aggregated_updates][klass][id][operation] = value
+      Thread.current[:aggregated_updates][klass][id][:timestamps] << column
     end
   end
 end

data/lib/counter_culture/reconciler.rb

@@ -59,7 +59,7 @@ module CounterCulture
     class Reconciliation
       attr_reader :counter, :options, :relation_class
 
-      delegate :model, :relation, :full_primary_key, :relation_reflect, :polymorphic?, :to => :counter
+      delegate :model, :relation, :full_primary_key, :relation_reflect_and_model, :relation_reflect, :polymorphic?, :to => :counter
       delegate *CounterCulture::Counter::CONFIG_OPTIONS, :to => :counter
 
       def initialize(counter, changes_holder, options, relation_class)
@@ -174,7 +174,7 @@ module CounterCulture
 
             with_writing_db_connection do
               conditions = Array.wrap(relation_class.primary_key).map { |key| [key, record.send(key)] }.to_h
-              relation_class.where(conditions).update_all(updates.join(', '))
+              relation_class.where(conditions).distinct(false).update_all(updates.join(', '))
             end
           end
         end
@@ -257,11 +257,11 @@ module CounterCulture
         # store joins in an array so that we can later apply column-specific
         # conditions
         join_clauses = reverse_relation.each_with_index.map do |cur_relation, index|
-          reflect = relation_reflect(cur_relation)
+          reflect, model = relation_reflect_and_model(cur_relation)
 
-          target_table = quote_table_name(reflect.active_record.table_name)
+          target_table = quote_table_name(model.table_name)
           target_table_alias = parameterize(target_table)
-          if relation_class.table_name == reflect.active_record.table_name
+          if relation_class.table_name == model.table_name
             # join with alias to avoid ambiguous table name in
             # self-referential models
             target_table_alias += "_#{target_table_alias}"
@@ -299,8 +299,8 @@ module CounterCulture
 
           # adds 'type' condition to JOIN clause if the current model is a
           # child in a Single Table Inheritance
-          if reflect.active_record.column_names.include?('type') &&
-              !model.descends_from_active_record?
+          if model.column_names.include?('type') &&
+             !model.descends_from_active_record?
             joins_sql += " AND #{target_table_alias}.type IN ('#{model.name}')"
           end
           if polymorphic?

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '3.11.3'.freeze
+  VERSION = '3.12.1'.freeze
 end

data/lib/counter_culture.rb

@@ -26,15 +26,26 @@ module CounterCulture
 
     result = yield
 
-    # aggregate the updates for each target record and execute SQL queries
+    # aggregate the updates for each target record and execute SQL queries using Arel
     Thread.current[:aggregated_updates].each do |klass, attrs|
       attrs.each do |rec_id, updates|
-        update_snippets = updates.map do |operation, value|
-          value = value.call if value.is_a?(Proc)
-          %Q{#{operation} #{value.is_a?(String) ? "'#{value}'" : value}} unless value == 0
-        end.compact
+        arel_updates = {}
 
-        if update_snippets.any?
+        # Build counter updates
+        updates[:counters].each do |column, info|
+          next if info[:delta] == 0
+          arel_updates[column] = Counter.build_arel_counter_expr(klass, column, info[:delta], info[:type])
+        end
+
+        # Build timestamp updates (compute timestamp at execution time)
+        if updates[:timestamps].any?
+          current_time = klass.send(:current_time_from_proper_timezone)
+          updates[:timestamps].each do |column|
+            arel_updates[column] = current_time
+          end
+        end
+
+        if arel_updates.any?
           primary_key = Thread.current[:primary_key_map][klass]
 
           conditions =
@@ -42,7 +53,7 @@ module CounterCulture
                 .zip(Array.wrap(rec_id))
                 .to_h
 
-          klass.where(conditions).update_all(update_snippets.join(', '))
+          klass.where(conditions).distinct(false).update_all(arel_updates)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.11.3
+  version: 3.12.1
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-23 00:00:00.000000000 Z
+date: 2026-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -320,6 +320,7 @@ files:
 - gemfiles/rails_7.1.gemfile
 - gemfiles/rails_7.2.gemfile
 - gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.1.gemfile
 - lib/counter_culture.rb
 - lib/counter_culture/configuration.rb
 - lib/counter_culture/counter.rb