active_record_host_pool 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5dcc0c95ead619555c18514507bf2711f7790c7e120570a5daaadf6506f1250
-  data.tar.gz: 37d82a6b2c495872cfa5522bd588c7dd047afa5b9cdc376acd9a9c96aba21d44
+  metadata.gz: 798f8b22ed7ed2801d40f3aaeb653ad4882ab3523daa1d93183b659adb5c3941
+  data.tar.gz: ccf81d17ac0e64a4b727b0aff13ac208514104c34e20536818fe4983efbde390
 SHA512:
-  metadata.gz: dd36a23cbb9636ba2dda0f303776715e05aef42ddecafa583388b32c7c11adcae6a0285743eede486712559d20309fa5fe834bd44a9bc539c2cc985c3f80c344
-  data.tar.gz: d18bec930c1c6358d310461bd958fa3d92baee83e7de0d629783610809aea7f552ef98a1cc7482707cd8eaef4d592321a00f2210302132c31fead5d27b471962
+  metadata.gz: 656affbe8e6eccff5d653cdbe7f560e6b48738dabfdd67187deadd76b6f46b51aef3ce96bf0955a52e6e74718b3c7e1a8664f74d69ba9458a17f48c8f85eecd2
+  data.tar.gz: 37c92ee23f9c58320b6be0011c80de891d0d518b7cc0a5481e2f8028b4d804e399dbc67dcc30aa4b807673ea7033357d29ddccf519d9d6210f64bac47d0584e5

data/lib/active_record_host_pool/clear_query_cache_patch.rb

@@ -29,10 +29,10 @@ if ActiveRecord.version >= Gem::Version.new('6.0')
 
       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,12 +27,17 @@ 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)
+    ruby2_keywords def execute_with_switching(*args, **kwargs)
       if _host_pool_current_database && !_no_switch
         _switch_connection
       end
-      execute_without_switching(*args)
+      execute_without_switching(*args, **kwargs)
     end
 
     def drop_database_with_no_switching(*args)

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.0"
+  VERSION = "1.2.2"
 end

data/test/helper.rb

@@ -5,7 +5,7 @@ require 'minitest/autorun'
 
 require 'active_record_host_pool'
 require 'logger'
-require 'mocha/minitest'
+require 'minitest/mock_expectations'
 require 'phenix'
 
 ENV['RAILS_ENV'] = 'test'
@@ -20,6 +20,8 @@ RAILS_6_1_WITH_NON_LEGACY_CONNECTION_HANDLING =
 
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + '/test.log')
 
+Thread.abort_on_exception = true
+
 # BEGIN preventing_writes? patch
 ## Rails 6.1 by default does not allow writing to replica databases which prevents
 ## us from properly setting up the test databases. This patch is used in test/schema.rb

data/test/test_arhp.rb

@@ -122,18 +122,22 @@ class ActiveRecordHostPoolTest < Minitest::Test
 
   def test_no_switch_when_creating_db
     conn = Pool1DbA.connection
-    conn.expects(:execute_without_switching)
-    conn.expects(:_switch_connection).never
-    assert conn._host_pool_current_database
-    conn.create_database(:some_args)
+    assert_called(conn, :execute_without_switching) do
+      refute_called(conn, :_switch_connection) do
+        assert conn._host_pool_current_database
+        conn.create_database(:some_args)
+      end
+    end
   end
 
   def test_no_switch_when_dropping_db
     conn = Pool1DbA.connection
-    conn.expects(:execute_without_switching)
-    conn.expects(:_switch_connection).never
-    assert conn._host_pool_current_database
-    conn.drop_database(:some_args)
+    assert_called(conn, :execute_without_switching) do
+      refute_called(conn, :_switch_connection) do
+        assert conn._host_pool_current_database
+        conn.drop_database(:some_args)
+      end
+    end
   end
 
   def test_underlying_assumption_about_test_db
@@ -163,8 +167,9 @@ class ActiveRecordHostPoolTest < Minitest::Test
     thread_id = switch_to_klass.connection.select_value('select @@pseudo_thread_id')
 
     # now, disable our auto-switching and trigger a mysql reconnect
-    switch_to_klass.connection.unproxied.stubs(:_switch_connection).returns(true)
-    Pool2DbD.connection.execute("KILL #{thread_id}")
+    switch_to_klass.connection.unproxied.stub(:_switch_connection, true) do
+      Pool2DbD.connection.execute("KILL #{thread_id}")
+    end
 
     # and finally, did mysql reconnect correctly?
     puts "\nAnd now we end up on #{current_database(switch_to_klass)}" if debug_me
@@ -174,7 +179,8 @@ class ActiveRecordHostPoolTest < Minitest::Test
   def test_release_connection
     pool = ActiveRecord::Base.connection_pool
     conn = pool.connection
-    pool.expects(:checkin).with(conn)
-    pool.release_connection
+    assert_called_with(pool, :checkin, [conn]) do
+      pool.release_connection
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-13 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -76,19 +76,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.10.0
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: minitest-mock_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: phenix
   requirement: !ruby/object:Gem::Requirement
@@ -131,20 +131,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.80.0
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  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'
 description: ''
 email:
 - bquorning@zendesk.com