active_record_host_pool 3.2.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14acd50a7c6157efd2c12fcc3adbb94a3e776d5f9e8db99b1ffb8cbc61ea7a04
-  data.tar.gz: f60ae6c33f74654dfb1420584c92e62524eb20fb6fdf45c686562d96e1d9cedd
+  metadata.gz: 1b17ac5ef20d2f62f857a6a4a7d62ff801767e00c1d5e72b0ec05c9c9818c004
+  data.tar.gz: a7a6b9847c9fda19f32c0929f1a99a5362c22193b550b45602d9d8dde7efde27
 SHA512:
-  metadata.gz: 65ea7cdc09a2ed57140800c0c4b2f5ada2ecff99e095553e984832719a3b89183e632e894fc8678143ede804cf1dfd41762decc0a8b7a1319368b5f374d1353e
-  data.tar.gz: e1bb04b975d9180b09d227c022d50db900725921f3172b9a26b352b36c995bbefd4224fbf224228f4ff99c083cdc0f4149632877ea12b63aa22406bced1487d7
+  metadata.gz: 4d9acc6b59e50dcbeea61b75ed8f3428487ce287136c0cc95b314eb871bfff39ff7380abd779e07870d8388d775864e13d4c3b56dd91be3723904a35618c5afa
+  data.tar.gz: 96e926441b4e9c70fe7ffbe2f46d76eb8ab729438fa01e967eabcfe043073c928c18c3984d51cb644d6bbcef99fd6cc0d57e23af671fda2fea4665acfdbe4a94

data/Changelog.md

@@ -6,6 +6,20 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
+## [4.1.0]
+
+### Changed
+- Remove dependency on `mutex_m`, instead using `Thread::Mutex` directly.
+
+## [4.0.0]
+
+### Changed
+- Moved `select_db` inside of the `with_raw_connection` block of the `#raw_execute` method. This should allow for using Rails' built-in reconnect & retry logic with the Trilogy adapter or Rails 7.1+.
+- In Rails 7.1+, when a new ConnectionProxy is instantiated the database switch is lazily triggered by the subsequent database query instead of immediately.
+
+### Removed
+- Calling `#clean!` and `#verified!` on connections because it is no longer necessary.
+
 ## [3.2.0]
 
 ### Added
@@ -14,7 +28,7 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 ## [3.1.1]
 
 ### Fixed
-- A typo causing `#clean!` to not run. 
+- A typo causing `#clean!` to not run.
 
 ## [3.1.0]
 

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -8,7 +8,7 @@ when :trilogy
   when "6.1", "7.0"
     require "trilogy_adapter/connection"
     ActiveRecord::Base.extend(TrilogyAdapter::Connection)
-  when "7.1", "7.2", "8.0"
+  when "7.1", "7.2", "8.0", "8.1"
     require "active_record/connection_adapters/trilogy_adapter"
   else
     raise "Unsupported version of Rails (v#{ActiveRecord::VERSION::STRING})"
@@ -28,20 +28,23 @@ module ActiveRecordHostPool
       @config[:database] = _host_pool_desired_database
     end
 
-    if ActiveRecord.version >= Gem::Version.new("7.1") || ActiveRecordHostPool.loaded_db_adapter == :trilogy
-      # Patch `raw_execute` instead of `execute` since this commit:
-      # https://github.com/rails/rails/commit/f69bbcbc0752ca5d5af327d55922614a26f5c7e9
-      def raw_execute(...)
-        if _host_pool_desired_database && !_no_switch
-          _switch_connection
+    if ActiveRecord.version >= Gem::Version.new("7.1")
+      def with_raw_connection(...)
+        super do |real_connection|
+          _switch_connection(real_connection) if _host_pool_desired_database && !_no_switch
+          yield real_connection
+        end
+      end
+    elsif ActiveRecordHostPool.loaded_db_adapter == :trilogy
+      def with_trilogy_connection(...)
+        super do |real_connection|
+          _switch_connection(real_connection) if _host_pool_desired_database && !_no_switch
+          yield real_connection
         end
-        super
       end
     else
       def execute(...)
-        if _host_pool_desired_database && !_no_switch
-          _switch_connection
-        end
+        _switch_connection(raw_connection) if _host_pool_desired_database && !_no_switch
         super
       end
     end
@@ -70,7 +73,7 @@ module ActiveRecordHostPool
 
     attr_accessor :_no_switch
 
-    def _switch_connection
+    def _switch_connection(real_connection)
       if _host_pool_desired_database &&
           (
            _desired_database_changed? ||
@@ -78,11 +81,7 @@ module ActiveRecordHostPool
          )
         log("select_db #{_host_pool_desired_database}", "SQL") do
           clear_cache!
-          raw_connection.select_db(_host_pool_desired_database)
-          if respond_to?(:clean!)
-            clean!
-            verified!
-          end
+          real_connection.select_db(_host_pool_desired_database)
         end
         @_cached_current_database = _host_pool_desired_database
         @_cached_connection_object_id = _real_connection_object_id

data/lib/active_record_host_pool/pool_proxy.rb

@@ -3,7 +3,6 @@
 require "delegate"
 require "active_record"
 require "active_record_host_pool/connection_adapter_mixin"
-require "mutex_m"
 
 # this module sits in between ConnectionHandler and a bunch of different ConnectionPools (one per host).
 # when a connection is requested, it goes like:
@@ -16,8 +15,6 @@ require "mutex_m"
 module ActiveRecordHostPool
   # Sits between ConnectionHandler and a bunch of different ConnectionPools (one per host).
   class PoolProxy < Delegator
-    include Mutex_m
-
     case ActiveRecordHostPool.loaded_db_adapter
     when :mysql2
       RESCUABLE_DB_ERROR = Mysql2::Error
@@ -26,9 +23,10 @@ module ActiveRecordHostPool
     end
 
     def initialize(pool_config)
-      super(pool_config)
+      super
       @pool_config = pool_config
       @config = pool_config.db_config.configuration_hash
+      @mutex = Mutex.new
     end
 
     def __getobj__
@@ -133,7 +131,7 @@ module ActiveRecordHostPool
       p = _connection_pool(false)
       return unless p
 
-      synchronize do
+      @mutex.synchronize do
         p.disconnect!
         p.automatic_reconnect = true
         _clear_connection_proxy_cache
@@ -219,12 +217,7 @@ module ActiveRecordHostPool
         @connection_proxy_cache ||= {}
         key = [connection, database]
 
-        @connection_proxy_cache[key] ||= begin
-          cx = ActiveRecordHostPool::ConnectionProxy.new(connection, database)
-          cx.raw_execute("SELECT 1", "ARHP SWITCH DB")
-
-          cx
-        end
+        @connection_proxy_cache[key] ||= ActiveRecordHostPool::ConnectionProxy.new(connection, database)
       end
     end
     # standard:enable Lint/DuplicateMethods

data/lib/active_record_host_pool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordHostPool
-  VERSION = "3.2.0"
+  VERSION = "4.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-04 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same