active_record_host_pool 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f626b21d430564a336b02a25263b73e005466bb3b654750218aa34af3b3a49
-  data.tar.gz: bcdae62eb1f0dbf16cc6c2cb2a9c2c17fe587e94cb4ce24b35ccc3cab794d43c
+  metadata.gz: 3f3e4946feb2a146c7dd715f51c583dc6bc9723fe08491023ec85adac537a22b
+  data.tar.gz: 708604983ef9815557c23c13ce88fb40588f4eb62ce4cf4e5363bd2a2f2eec2a
 SHA512:
-  metadata.gz: 74bcb39947f4b10f8bfef8389beb1fc2e14acabc05bea868a13d0b7e921968dc15deb43376cc68cd403b89fc9cac7cd90b436776edf16e3cb18f663aee678845
-  data.tar.gz: 75253b513d4f8695293de0cb810d9c4bd63e85c0815b56ac6d4984218b8c05d2c11be76dbe5f2b28839198d0f43cc59da768e193f46dd35cf1f3e29c92ddcaf2
+  metadata.gz: d67cdfa238ffb5a68f333a86eda8855e25b3e763f1bc1b5e8abb11766d48e524de7d48745229f62f241b17cd79c699e40ab8561995875771133ae7b28cfca3d4
+  data.tar.gz: 2dac7894db1c4b33c66924323578464929aeb370d6a79dfeab9c8ecb597bcb5299ab5de1294c41d7a68e949637f897928e54e8e3c4b8090300576a4e8976001e

data/lib/active_record_host_pool/clear_query_cache_patch.rb

@@ -1,42 +1,46 @@
 # frozen_string_literal: true
 
-if ActiveRecord.version >= Gem::Version.new('6.0')
-  module ActiveRecordHostPool
-    # ActiveRecord 6.0 introduced multiple database support. With that, an update
-    # has been made in https://github.com/rails/rails/pull/35089 to ensure that
-    # all query caches are cleared across connection handlers and pools. If you
-    # write on one connection, the other connection will have the update that
-    # occurred.
-    #
-    # This broke ARHP which implements its own pool, allowing you to access
-    # multiple databases with the same connection (e.g. 1 connection for 100
-    # shards on the same server).
-    #
-    # This patch maintains the reference to the database during the cache clearing
-    # to ensure that the database doesn't get swapped out mid-way into an
-    # operation.
-    #
-    # This is a private Rails API and may change in future releases as they're
-    # actively working on sharding in Rails 6 and above.
-    module ClearQueryCachePatch
-      def clear_query_caches_for_current_thread
-        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_pool._unproxied_connection._host_pool_current_database = host_pool_current_database_was
+# ActiveRecord 6.0 introduced multiple database support. With that, an update
+# has been made in https://github.com/rails/rails/pull/35089 to ensure that
+# all query caches are cleared across connection handlers and pools. If you
+# write on one connection, the other connection will have the update that
+# occurred.
+#
+# This broke ARHP which implements its own pool, allowing you to access
+# multiple databases with the same connection (e.g. 1 connection for 100
+# shards on the same server).
+#
+# This patch maintains the reference to the database during the cache clearing
+# to ensure that the database doesn't get swapped out mid-way into an
+# operation.
+#
+# This is a private Rails API and may change in future releases as they're
+# actively working on sharding in Rails 6 and above.
+module ActiveRecordHostPool
+  # For Rails 6.1 & 7.0.
+  module ClearOnHandlerPatch
+    def clear_on_handler(handler)
+      handler.all_connection_pools.each do |pool|
+        pool._unproxied_connection.clear_query_cache if pool.active_connection?
       end
+    end
+  end
 
-      def clear_on_handler(handler)
-        handler.all_connection_pools.each do |pool|
-          db_was = pool._unproxied_connection._host_pool_current_database
+  # For Rails 6.0.
+  module ClearQueryCachePatch
+    def clear_query_caches_for_current_thread
+      ActiveRecord::Base.connection_handlers.each_value do |handler|
+        handler.connection_pool_list.each do |pool|
           pool._unproxied_connection.clear_query_cache if pool.active_connection?
-        ensure
-          pool._unproxied_connection._host_pool_current_database = db_was
         end
       end
     end
   end
+end
 
-  ActiveRecord::Base.singleton_class.prepend ActiveRecordHostPool::ClearQueryCachePatch
+case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+when '6.1', '7.0'
+  ActiveRecord::Base.singleton_class.prepend(ActiveRecordHostPool::ClearOnHandlerPatch)
+when '6.0'
+  ActiveRecord::Base.singleton_class.prepend(ActiveRecordHostPool::ClearQueryCachePatch)
 end

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -33,11 +33,14 @@ module ActiveRecordHostPool
     end
 
     def self.ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
-    ruby2_keywords def execute_with_switching(*args, **kwargs)
+    # This one really does need ruby2_keywords; in Rails 6.0 the method does not take
+    # any keyword arguments, but in Rails 7.0 it does. So, we don't know whether or not
+    # what we're delegating to takes kwargs, so ruby2_keywords is needed.
+    ruby2_keywords def execute_with_switching(*args)
       if _host_pool_current_database && !_no_switch
         _switch_connection
       end
-      execute_without_switching(*args, **kwargs)
+      execute_without_switching(*args)
     end
 
     def drop_database_with_no_switching(*args)

data/lib/active_record_host_pool/version.rb

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

data/test/helper.rb

@@ -2,6 +2,7 @@
 
 require 'bundler/setup'
 require 'minitest/autorun'
+require 'pry-byebug'
 
 require 'active_record_host_pool'
 require 'logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2023-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,6 +75,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-mock_expectations
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +131,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement