active_record_host_pool 1.2.3 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f626b21d430564a336b02a25263b73e005466bb3b654750218aa34af3b3a49
-  data.tar.gz: bcdae62eb1f0dbf16cc6c2cb2a9c2c17fe587e94cb4ce24b35ccc3cab794d43c
+  metadata.gz: cef6cffe1f0c00bea6d588f48093d20abb29f87e9cdab6d84eba31f9b918a44e
+  data.tar.gz: 9e443c3874c4b24b2955245dfa12183521386696937bc27d21ce9037b9e90ee5
 SHA512:
-  metadata.gz: 74bcb39947f4b10f8bfef8389beb1fc2e14acabc05bea868a13d0b7e921968dc15deb43376cc68cd403b89fc9cac7cd90b436776edf16e3cb18f663aee678845
-  data.tar.gz: 75253b513d4f8695293de0cb810d9c4bd63e85c0815b56ac6d4984218b8c05d2c11be76dbe5f2b28839198d0f43cc59da768e193f46dd35cf1f3e29c92ddcaf2
+  metadata.gz: 2cadfa3a2d2c582a71a3538692edd4fbde67e2266f98d6fdcc1133d40bd0db33969eca2ef1a0ef8ccb22b20a01fb263d76a7cfa88a877b3ac46b7d19d1852346
+  data.tar.gz: 1ddd95edd00b9bd496cb861db3ecbc7be607c0174ca59e68ca4eebf2546137dff24881d4a6d3d4cc940fabcc1d5a1c9e7477df14c744f9e00814d7bcf5b5d29a

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)
@@ -71,7 +74,7 @@ module ActiveRecordHostPool
            @connection.object_id != @_cached_connection_object_id
          )
         log("select_db #{_host_pool_current_database}", "SQL") do
-          clear_cache! if respond_to?(:clear_cache!)
+          clear_cache!
           raw_connection.select_db(_host_pool_current_database)
         end
         @_cached_current_database = _host_pool_current_database

data/lib/active_record_host_pool/connection_proxy.rb

@@ -50,11 +50,13 @@ module ActiveRecordHostPool
         __getobj__.send(symbol, *args, &blk)
       end
     end
+    ruby2_keywords :send if respond_to?(:ruby2_keywords, true)
 
     private
 
     def select(*args)
       @cx.__send__(:select, *args)
     end
+    ruby2_keywords :select if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/active_record_host_pool/pool_proxy_6_1.rb

@@ -3,6 +3,7 @@
 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:
@@ -15,6 +16,8 @@ require 'active_record_host_pool/connection_adapter_mixin'
 module ActiveRecordHostPool
   # Sits between ConnectionHandler and a bunch of different ConnectionPools (one per host).
   class PoolProxy < Delegator
+    include Mutex_m
+
     def initialize(pool_config)
       super(pool_config)
       @pool_config = pool_config
@@ -68,16 +71,18 @@ module ActiveRecordHostPool
       p = _connection_pool(false)
       return unless p
 
-      p.disconnect!
-      p.automatic_reconnect = true if p.respond_to?(:automatic_reconnect=)
-      _clear_connection_proxy_cache
+      synchronize do
+        p.disconnect!
+        p.automatic_reconnect = true
+        _clear_connection_proxy_cache
+      end
     end
 
     def automatic_reconnect=(value)
       p = _connection_pool(false)
       return unless p
 
-      p.automatic_reconnect = value if p.respond_to?(:automatic_reconnect=)
+      p.automatic_reconnect = value
     end
 
     def clear_reloadable_connections!

data/lib/active_record_host_pool/pool_proxy_legacy.rb

@@ -71,7 +71,7 @@ module ActiveRecordHostPool
       return unless p
 
       p.disconnect!
-      p.automatic_reconnect = true if p.respond_to?(:automatic_reconnect=)
+      p.automatic_reconnect = true
       _clear_connection_proxy_cache
     end
 

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.5"
 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.5
 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-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -47,90 +47,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bump
-  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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.10.0
-- !ruby/object:Gem::Dependency
-  name: minitest-mock_expectations
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: phenix
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.0.0
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.80.0
 description: ''
 email:
 - bquorning@zendesk.com
@@ -168,7 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="