active_record_host_pool 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6c85e552706dd86fe493aadff36c1c3cc6d9115ab9ee7bbfd627b3d684a02bd
-  data.tar.gz: 7effa38f67de9456d748027f27544bbc4f07afacba671c505dd8d23645648572
+  metadata.gz: cc285794dcf2d9fd3d54249bc94aea1a9ae64d76868040dc583aa669388cd444
+  data.tar.gz: fe57775f7b80266bddb5f019b48eb7f5a741a7a9f8e0858604e6a74e12df5501
 SHA512:
-  metadata.gz: 8119ce55b8f44d7e29f195228c7055c1fe3c771916fc3ff31cc51e2db3ed7064c14db2424b6fdebf0a0a086e894cfb33faa97d87f1a16d272bff54957d3e20b0
-  data.tar.gz: 885cb1e3676d698f93394eb8686af27d5b2d2f2d194f3e533a3a20f3272678a08caf92d6819d08002c989f637430f8eb4d9fddd66d5bbbdccafbbd006da44c57
+  metadata.gz: 76037970cdd4288865b5e7e02d233d64699c60cc9054887465b21442e136da7f336d77623be76222ee45a75daac74b5e34581942793bf379fcb7df0b6229a4c4
+  data.tar.gz: e8ae94a9a9141891e5a4dbb0a61d08b13499546603b409f73d9a0de799112c68ca2705670a200c08cbb7ce3178135040808ac14323ac223afbc9519e21bff960

data/Changelog.md

@@ -6,6 +6,27 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
+## [2.2.0]
+### Removed
+- Support for Ruby 3.0.
+
+### Added
+- Rails 6.1 testing with Trilogy.
+
+### Fixed
+- Fixed using ActiveRecordHostPool and the `activerecord-trilogy-adapter v3.1+`.
+
+### Changed
+-  ActiveRecordHostPool will now raise an exception if you try to use a version of `activerecord-trilogy-adapter < 3.1`.
+
+## [2.1.0]
+
+### Changed
+- ActiveRecordHostPool now uses prepend to patch `#execute`, `#raw_execute`, `#drop_database`, `#create_database`, and `#disconnect!`. Prepending is incompatible when also using `alias` or `alias_method` to patch those methods; avoid aliasing them to prevent an infinite loop.
+
+### Removed
+- Dropped support for Ruby 2.7.x.
+
 ## [2.0.0]
 
 ### Added

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -7,7 +7,6 @@ when :trilogy
   case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
   when "6.1", "7.0"
     require "trilogy_adapter/connection"
-    require "trilogy_adapter/errors"
     ActiveRecord::Base.extend(TrilogyAdapter::Connection)
   when "7.1"
     require "active_record/connection_adapters/trilogy_adapter"
@@ -18,32 +17,7 @@ end
 
 module ActiveRecordHostPool
   module DatabaseSwitch
-    def self.included(base)
-      base.class_eval do
-        attr_reader(:_host_pool_current_database)
-
-        # Patch `raw_execute` instead of `execute` since this commit:
-        # https://github.com/rails/rails/commit/f69bbcbc0752ca5d5af327d55922614a26f5c7e9
-        case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
-        when "7.1"
-          alias_method :raw_execute_without_switching, :raw_execute
-          alias_method :raw_execute, :raw_execute_with_switching
-        else
-          alias_method :execute_without_switching, :execute
-          alias_method :execute, :execute_with_switching
-        end
-
-        alias_method :drop_database_without_no_switching, :drop_database
-        alias_method :drop_database, :drop_database_with_no_switching
-
-        alias_method :create_database_without_no_switching, :create_database
-        alias_method :create_database, :create_database_with_no_switching
-
-        alias_method :disconnect_without_host_pooling!, :disconnect!
-        alias_method :disconnect!, :disconnect_with_host_pooling!
-      end
-    end
-
+    attr_reader :_host_pool_current_database
     def initialize(*)
       @_cached_current_database = nil
       super
@@ -54,44 +28,42 @@ module ActiveRecordHostPool
       @config[:database] = _host_pool_current_database
     end
 
-    def self.ruby2_keywords(*); end unless respond_to?(:ruby2_keywords, true)
-    # 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.
-    if ActiveRecord.version >= Gem::Version.new("7.1")
-      ruby2_keywords def raw_execute_with_switching(*args)
+    if ActiveRecord.version >= Gem::Version.new("7.1") || ActiveRecordHostPool.loaded_db_adapter == :trilogy
+      # Patch `raw_execute` instead of `execute` since this commit:
+      # https://github.com/rails/rails/commit/f69bbcbc0752ca5d5af327d55922614a26f5c7e9
+      def raw_execute(...)
         if _host_pool_current_database && !_no_switch
           _switch_connection
         end
-        raw_execute_without_switching(*args)
+        super
       end
     else
-      ruby2_keywords def execute_with_switching(*args)
+      def execute(...)
         if _host_pool_current_database && !_no_switch
           _switch_connection
         end
-        execute_without_switching(*args)
+        super
       end
     end
 
-    def drop_database_with_no_switching(*args)
+    def drop_database(...)
       self._no_switch = true
-      drop_database_without_no_switching(*args)
+      super
     ensure
       self._no_switch = false
     end
 
-    def create_database_with_no_switching(*args)
+    def create_database(...)
       self._no_switch = true
-      create_database_without_no_switching(*args)
+      super
     ensure
       self._no_switch = false
     end
 
-    def disconnect_with_host_pooling!
+    def disconnect!
       @_cached_current_database = nil
       @_cached_connection_object_id = nil
-      disconnect_without_host_pooling!
+      super
     end
 
     private
@@ -130,9 +102,9 @@ end
 
 case ActiveRecordHostPool.loaded_db_adapter
 when :mysql2
-  ActiveRecord::ConnectionAdapters::Mysql2Adapter.include(ActiveRecordHostPool::DatabaseSwitch)
+  ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(ActiveRecordHostPool::DatabaseSwitch)
 when :trilogy
-  ActiveRecord::ConnectionAdapters::TrilogyAdapter.include(ActiveRecordHostPool::DatabaseSwitch)
+  ActiveRecord::ConnectionAdapters::TrilogyAdapter.prepend(ActiveRecordHostPool::DatabaseSwitch)
 end
 
 ActiveRecord::ConnectionAdapters::PoolConfig.prepend(ActiveRecordHostPool::PoolConfigPatch)

data/lib/active_record_host_pool/connection_proxy.rb

@@ -44,14 +44,13 @@ module ActiveRecordHostPool
       __getobj__.private_methods(all) | super
     end
 
-    def send(symbol, *args, &blk)
+    def send(symbol, ...)
       if respond_to?(symbol, true) && !__getobj__.respond_to?(symbol, true)
         super
       else
-        __getobj__.send(symbol, *args, &blk)
+        __getobj__.send(symbol, ...)
       end
     end
-    ruby2_keywords :send if respond_to?(:ruby2_keywords, true)
 
     def ==(other)
       self.class == other.class &&
@@ -67,9 +66,8 @@ module ActiveRecordHostPool
 
     private
 
-    def select(*args)
-      @cx.__send__(:select, *args)
+    def select(...)
+      @cx.__send__(:select, ...)
     end
-    ruby2_keywords :select if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/active_record_host_pool/version.rb

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

data/lib/active_record_host_pool.rb

@@ -15,7 +15,11 @@ if Gem.loaded_specs.include?("mysql2")
   ActiveRecordHostPool.loaded_db_adapter = :mysql2
 elsif Gem.loaded_specs.include?("trilogy")
   require "trilogy"
-  require "activerecord-trilogy-adapter" if ActiveRecord.version < Gem::Version.new("7.1")
+  if ActiveRecord.version < Gem::Version.new("7.1")
+    require "activerecord-trilogy-adapter"
+    require "trilogy_adapter/version"
+    raise "ActiveRecordHostPool is only compatible with activerecord-trilogy-adapter v3.1+" if Gem::Version.new("3.1") > TrilogyAdapter::VERSION
+  end
   ActiveRecordHostPool.loaded_db_adapter = :trilogy
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-08 00:00:00.000000000 Z
+date: 2024-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,9 +20,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,9 +27,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
 description: ''
 email:
 - bquorning@zendesk.com
@@ -65,14 +59,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same