active_record_host_pool 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c8a74e78b05f5094b89403c7e77ebbe40802ebeeec9f8ea724cdf3527c20dea
-  data.tar.gz: 8e8e5c3ba32256bcf5c39e974bb8565ae464bad9aafa41d0ad5309802d226dc2
+  metadata.gz: 06f626b21d430564a336b02a25263b73e005466bb3b654750218aa34af3b3a49
+  data.tar.gz: bcdae62eb1f0dbf16cc6c2cb2a9c2c17fe587e94cb4ce24b35ccc3cab794d43c
 SHA512:
-  metadata.gz: d3c9ed0921dae7152f1de4e498edd761960b81038c8d46a32674949fe152d8dd2b9ad8a836322d8cabf6f05a3484e9297a535553dc8c888109958fdb00eacea9
-  data.tar.gz: fcb8f19f314456e8dc293a6233650723da2f6bad8548fba12671827d12bd1c3842cb555d2b2ca413488cadf9099b8b491b01ef256279099a3a3a0473b4507701
+  metadata.gz: 74bcb39947f4b10f8bfef8389beb1fc2e14acabc05bea868a13d0b7e921968dc15deb43376cc68cd403b89fc9cac7cd90b436776edf16e3cb18f663aee678845
+  data.tar.gz: 75253b513d4f8695293de0cb810d9c4bd63e85c0815b56ac6d4984218b8c05d2c11be76dbe5f2b28839198d0f43cc59da768e193f46dd35cf1f3e29c92ddcaf2

data/lib/active_record_host_pool/clear_query_cache_patch.rb

@@ -20,19 +20,19 @@ if ActiveRecord.version >= Gem::Version.new('6.0')
     # actively working on sharding in Rails 6 and above.
     module ClearQueryCachePatch
       def clear_query_caches_for_current_thread
-        host_pool_current_database_was = connection.unproxied._host_pool_current_database
+        host_pool_current_database_was = connection_pool._unproxied_connection._host_pool_current_database
         super
       ensure
         # restore in case clearing the cache changed the database
-        connection.unproxied._host_pool_current_database = host_pool_current_database_was
+        connection_pool._unproxied_connection._host_pool_current_database = host_pool_current_database_was
       end
 
       def clear_on_handler(handler)
         handler.all_connection_pools.each do |pool|
-          db_was = pool.connection.unproxied._host_pool_current_database
-          pool.connection.clear_query_cache if pool.active_connection?
+          db_was = pool._unproxied_connection._host_pool_current_database
+          pool._unproxied_connection.clear_query_cache if pool.active_connection?
         ensure
-          pool.connection.unproxied._host_pool_current_database = db_was
+          pool._unproxied_connection._host_pool_current_database = db_was
         end
       end
     end

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -8,11 +8,6 @@ module ActiveRecordHostPool
       base.class_eval do
         attr_reader(:_host_pool_current_database)
 
-        def _host_pool_current_database=(database)
-          @_host_pool_current_database = database
-          @config[:database] = _host_pool_current_database
-        end
-
         alias_method :execute_without_switching, :execute
         alias_method :execute, :execute_with_switching
 
@@ -32,6 +27,11 @@ module ActiveRecordHostPool
       super
     end
 
+    def _host_pool_current_database=(database)
+      @_host_pool_current_database = database
+      @config[:database] = _host_pool_current_database
+    end
+
     def self.ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
     ruby2_keywords def execute_with_switching(*args, **kwargs)
       if _host_pool_current_database && !_no_switch

data/lib/active_record_host_pool/pool_proxy_6_1.rb

@@ -34,13 +34,17 @@ module ActiveRecordHostPool
     attr_reader :pool_config
 
     def connection(*args)
-      real_connection = _connection_pool.connection(*args)
+      real_connection = _unproxied_connection(*args)
       _connection_proxy_for(real_connection, @config[:database])
     rescue Mysql2::Error, ActiveRecord::NoDatabaseError
       _connection_pools.delete(_pool_key)
       Kernel.raise
     end
 
+    def _unproxied_connection(*args)
+      _connection_pool.connection(*args)
+    end
+
     # by the time we are patched into ActiveRecord, the current thread has already established
     # a connection.  thus we need to patch both connection and checkout/checkin
     def checkout(*args, &block)

data/lib/active_record_host_pool/pool_proxy_legacy.rb

@@ -36,13 +36,17 @@ module ActiveRecordHostPool
     attr_reader :spec
 
     def connection(*args)
-      real_connection = _connection_pool.connection(*args)
+      real_connection = _unproxied_connection(*args)
       _connection_proxy_for(real_connection, @config[:database])
     rescue Mysql2::Error, ActiveRecord::NoDatabaseError
       _connection_pools.delete(_pool_key)
       Kernel.raise
     end
 
+    def _unproxied_connection(*args)
+      _connection_pool.connection(*args)
+    end
+
     # by the time we are patched into ActiveRecord, the current thread has already established
     # a connection.  thus we need to patch both connection and checkout/checkin
     def checkout(*args, &block)

data/lib/active_record_host_pool/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-23 00:00:00.000000000 Z
+date: 2023-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord