counter_culture 3.7.0 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88687e8c584a1643026e8e09d9f64484110fd7a19ebf1faa6cb311361e8c35ca
-  data.tar.gz: a81ac645489129472e265f3bfefa0573f11a9e8419a40ba7f4c687c692367177
+  metadata.gz: 225d25bff8cd9226371b162e6761603271cbac02c74be1dd7398de2dc63dbb71
+  data.tar.gz: ea2b215508e285bab75efcbf3aeb153a15458c22db0cc0b79350bb2e9b3a9e05
 SHA512:
-  metadata.gz: 82ffa1af6e6ad80f68a56b77cdae1f68dd30aa63535281f4ee19ee3ad1e5f88cc7053ae4cab6f1786db7038baeb81cf5c434b1b657f886b62862d79b0d99d7dc
-  data.tar.gz: 83e5c626c97583727a5cbef6c824dd5eb25625d169a53e65e73bd1d2ab633121bb2a1a2de430a2d522caa92382b5852d731e0f954818fa906ab2b0060986119a
+  metadata.gz: 5362e9b1db5c4a81944e3deeddec9c7945ae349cca9f663dae140fb1516f00b9bd41d4d34af4705c2d4600ee65dabe2a41bc0a53e1a98ba682385228b0f4e41a
+  data.tar.gz: 60d99dab523e3f339961c4d19393f27de41006c361dc190baf25676157dded5b98382d77cca3dd76533cb070e3eec14965bb90ffe3f13991ba6d409cdf3e779a

data/.circleci/config.yml

@@ -49,7 +49,7 @@ workflows:
           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"]
+              rails-version: ["5.2", "6.0", "6.1", "7.0", "7.1", "7.2"]
               database: ["postgresql", "sqlite3", "mysql2"]
             exclude:
               - ruby-version: "3.0"
@@ -106,3 +106,30 @@ workflows:
               - ruby-version: "2.6"
                 rails-version: "7.1"
                 database: "mysql2"
+              - ruby-version: "2.6"
+                rails-version: "7.2"
+                database: "postgresql"
+              - ruby-version: "2.6"
+                rails-version: "7.2"
+                database: "sqlite3"
+              - ruby-version: "2.6"
+                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"

data/Appraisals

@@ -4,6 +4,7 @@
   6.1
   7.0
   7.1
+  7.2
 ].each do |rails_version|
   appraise "rails-#{rails_version}" do
     gem 'rails', "~> #{rails_version}.0"

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.8.0 (October 4, 2024)
+
+New features:
+  - Prefer using `with_connection` where possible (#398)
+
 ## 3.7.0 (June 20, 2024)
 
 New features:

data/gemfiles/rails_7.2.gemfile

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

data/lib/counter_culture/counter.rb

@@ -1,3 +1,5 @@
+require_relative './with_connection'
+
 module CounterCulture
   class Counter
     CONFIG_OPTIONS = [ :column_names, :counter_cache_name, :delta_column, :foreign_key_values, :touch, :delta_magnitude, :execute_after_commit ]
@@ -65,11 +67,13 @@ module CounterCulture
         # 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 = if klass.connection.adapter_name == 'Mysql2'
-                          "#{klass.quoted_table_name}.#{model.connection.quote_column_name(change_counter_column)}"
-                        else
-                          "#{model.connection.quote_column_name(change_counter_column)}"
-                        end
+        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
 

data/lib/counter_culture/reconciler.rb

@@ -1,6 +1,8 @@
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/attribute_accessors'
 
+require_relative './with_connection'
+
 module CounterCulture
   class Reconciler
     ACTIVE_RECORD_VERSION = Gem.loaded_specs["activerecord"].version
@@ -312,7 +314,9 @@ module CounterCulture
       # using Postgres with schema-namespaced tables. But then it's required,
       # and otherwise it's just a no-op, so why not do it?
       def quote_table_name(table_name)
-        relation_class.connection.quote_table_name(table_name)
+        WithConnection.new(relation_class).call do |connection|
+          connection.quote_table_name(table_name)
+        end
       end
 
       def parameterize(string)

data/lib/counter_culture/version.rb

@@ -1,3 +1,3 @@
 module CounterCulture
-  VERSION = '3.7.0'.freeze
+  VERSION = '3.8.0'.freeze
 end

data/lib/counter_culture/with_connection.rb

@@ -0,0 +1,33 @@
+module CounterCulture
+  class WithConnection
+    def initialize(recipient)
+      @recipient = recipient
+    end
+
+    attr_reader :recipient
+
+    def call
+      if rails_7_2_or_greater?
+        recipient.with_connection do |connection|
+          yield connection
+        end
+      elsif rails_7_1?
+        recipient.connection_pool.with_connection do |connection|
+          yield connection
+        end
+      else
+        yield recipient.connection
+      end
+    end
+
+    private
+
+    def rails_7_1?
+      Gem::Requirement.new('~> 7.1.0').satisfied_by?(Gem::Version.new(Rails.version))
+    end
+
+    def rails_7_2_or_greater?
+      Gem::Requirement.new('>= 7.2.0').satisfied_by?(Gem::Version.new(Rails.version))
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: counter_culture
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.8.0
 platform: ruby
 authors:
 - Magnus von Koeller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-20 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -318,12 +318,14 @@ files:
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
 - gemfiles/rails_7.1.gemfile
+- gemfiles/rails_7.2.gemfile
 - lib/counter_culture.rb
 - lib/counter_culture/counter.rb
 - lib/counter_culture/extensions.rb
 - lib/counter_culture/reconciler.rb
 - lib/counter_culture/skip_updates.rb
 - lib/counter_culture/version.rb
+- lib/counter_culture/with_connection.rb
 - lib/generators/counter_culture_generator.rb
 - lib/generators/templates/counter_culture_migration.rb.erb
 homepage: https://github.com/magnusvk/counter_culture