active_record_host_pool 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dc3e41230c1cc7b208056d7f6fe99abe717e190b55cdca3ff5df9f1513fcad1
-  data.tar.gz: 92f1982d46da0644184083a78d72ad878d54ff70413f347fcb67bc3890cfaeca
+  metadata.gz: 6c8a74e78b05f5094b89403c7e77ebbe40802ebeeec9f8ea724cdf3527c20dea
+  data.tar.gz: 8e8e5c3ba32256bcf5c39e974bb8565ae464bad9aafa41d0ad5309802d226dc2
 SHA512:
-  metadata.gz: b3e4c62f5aee3ae968622ca9a7fef59fd9974c4153c244c312715036f6753a0ec58ba3083247bb9a4b9479db3a3c55a8182c85ae320d273ad90a1084ea745b46
-  data.tar.gz: 1fcec2e7e23272e50894a19bd4fc195e0360089d3a5e44f98fc6a589723f3a6bb8dae2276dbeeec31f05f87f89641308909412b28f73f929bc2358605fe30937
+  metadata.gz: d3c9ed0921dae7152f1de4e498edd761960b81038c8d46a32674949fe152d8dd2b9ad8a836322d8cabf6f05a3484e9297a535553dc8c888109958fdb00eacea9
+  data.tar.gz: fcb8f19f314456e8dc293a6233650723da2f6bad8548fba12671827d12bd1c3842cb555d2b2ca413488cadf9099b8b491b01ef256279099a3a3a0473b4507701

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -32,11 +32,12 @@ module ActiveRecordHostPool
       super
     end
 
-    def execute_with_switching(*args)
+    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
         _switch_connection
       end
-      execute_without_switching(*args)
+      execute_without_switching(*args, **kwargs)
     end
 
     def drop_database_with_no_switching(*args)
@@ -97,7 +98,7 @@ module ActiveRecord
   module ConnectionAdapters
     class ConnectionHandler
       case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-      when '6.1'
+      when '6.1', '7.0'
 
         :noop
 
@@ -122,6 +123,7 @@ ActiveRecord::ConnectionAdapters::Mysql2Adapter.include(ActiveRecordHostPool::Da
 
 # In Rails 6.1 Connection Pools are no longer instantiated in #establish_connection but in a
 # new pool method.
-if "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}" == '6.1'
+case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+when '6.1', '7.0'
   ActiveRecord::ConnectionAdapters::PoolConfig.prepend(ActiveRecordHostPool::PoolConfigPatch)
 end

data/lib/active_record_host_pool/pool_proxy.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-if "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}" == '6.1'
+case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+when '6.1', '7.0'
   require 'active_record_host_pool/pool_proxy_6_1'
 else
   require 'active_record_host_pool/pool_proxy_legacy'

data/lib/active_record_host_pool/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordHostPool
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 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,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Benjamin Quorning
 - Gabe Martin-Dempesy
 - Pierre Schambacher
 - Ben Osheroff
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,7 +22,7 @@ dependencies:
         version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 5.1.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -174,7 +160,7 @@ homepage: https://github.com/zendesk/active_record_host_pool
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -189,8 +175,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same
   host