Merge pull request #104 from zendesk/bquorning.fix-clear-query-cache-patch

Fix ActiveRecord::Base.clear_on_handler

Author: bquorning

.github/workflows/ci.yml

@@ -32,10 +32,10 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - 2.6
-          - 2.7
-          - 3.0
-          - 3.1
+          - "2.6"
+          - "2.7"
+          - "3.0"
+          - "3.1"
         gemfile:
           - rails5.1
           - rails5.2

Changelog.md

@@ -6,6 +6,13 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
+## [1.2.2] - 2023-01-18
+### Added
+- Add a new `ActiveRecordHostPool::PoolProxy#_unproxied_connection` method which gives access to the underlying, "real", shared connection without going through the connection proxy, which would call `#_host_pool_current_database=` on the underlying connection. (https://github.com/zendesk/active_record_host_pool/pull/104)
+
+### Fixed
+- Fix the patch for `ActiveRecord::Base.clear_on_handler` to work correctly right after the creation of a new connection pool. (https://github.com/zendesk/active_record_host_pool/pull/104)
+
 ## [1.2.1] - 2022-12-23
 ### Fixed
 - Fix forwarding of kwargs when calling `#execute` in Rails 7. (https://github.com/zendesk/active_record_host_pool/pull/101)

gemfiles/rails5.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (1.2.1)
+    active_record_host_pool (1.2.2)
       activerecord (>= 5.1.0, < 7.1)
       mysql2
 

gemfiles/rails5.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (1.2.1)
+    active_record_host_pool (1.2.2)
       activerecord (>= 5.1.0, < 7.1)
       mysql2
 

gemfiles/rails6.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (1.2.1)
+    active_record_host_pool (1.2.2)
       activerecord (>= 5.1.0, < 7.1)
       mysql2
 

gemfiles/rails6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (1.2.1)
+    active_record_host_pool (1.2.2)
       activerecord (>= 5.1.0, < 7.1)
       mysql2
 

gemfiles/rails7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    active_record_host_pool (1.2.1)
+    active_record_host_pool (1.2.2)
       activerecord (>= 5.1.0, < 7.1)
       mysql2
 

lib/active_record_host_pool/clear_query_cache_patch.rb

@@ -29,10 +29,10 @@ def clear_query_caches_for_current_thread
 
       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

lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -8,11 +8,6 @@ def self.included(base)
       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 @@ def initialize(*)
       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

lib/active_record_host_pool/pool_proxy_6_1.rb

@@ -34,13 +34,17 @@ def __setobj__(pool_config)
     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)