active_record_host_pool 2.0.0.pre.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4c99be0433d92bea15d4c49896f356536455e944e7b11e2ae7f7ea53b3e7d1a
-  data.tar.gz: 96a0b0d168ea82987e4e128263351c23dd80c390abed82d187e73393f0003b80
+  metadata.gz: 0ba0aa0ff3c0b19e4895118e76f84cc57f46481baa482c59925946ecd56765bb
+  data.tar.gz: e276dbda95168a03b511a5d7da14f94411ca7b8bc910ea2684631f25c9a22cf1
 SHA512:
-  metadata.gz: 2fadaf3620e2adad2931483ad3d6f1d379e3ab252872245c7cf1e3fe3133bfc2dda16ecb8f83632d4898fd850621d064393a84078edc0e2c62338cb67aecd080
-  data.tar.gz: b28ac1e4864dc7c0d9ed8924132af7394b9144ec5a77a55e1d99ce2a3863209f8cb1967732dc628675bbc580ef252189c49891f473fd56ccbff00aca42464c50
+  metadata.gz: 5b455f5fd116f96035fa816b39e0baf7f698d885decece79fd213c690c07db6b2f54e2328d4fa8dab68c536e86b58a9261b3c1a4c8aa45ccf35c1cb7b237168e
+  data.tar.gz: aa7295a9be8e2892ff34452de014ea7627255d58e6eccd6a0d4a18d3b03152adb18fb2e453df017a058eeaf26bf8d4a768db3e436cef7da498f69e03d5f50917

data/Changelog.md

@@ -6,7 +6,15 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
-## [2.0.0.pre.2]
+## [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
 - Add support for Rails 7.1.
@@ -16,6 +24,9 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 - Remove `mysql2` as a direct dependency, test Rails 7.0 with `mysql2` and `activerecord-trilogy-adapter`.
 - Remove support for Rails 5.1, 5.2, and 6.0.
 
+### Fixed
+- Implement equality for connection proxies to consider database; allows fixture loading for different databases
+
 ## [1.2.5] - 2023-07-14
 ### Added
 - Start testing with Ruby 3.2.

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -18,32 +18,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 +29,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)
+      # 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 +103,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

@@ -6,6 +6,7 @@ require "delegate"
 # for each call to the connection.  upon executing a statement, the connection will switch to that database.
 module ActiveRecordHostPool
   class ConnectionProxy < Delegator
+    attr_reader :database
     def initialize(cx, database)
       super(cx)
       @cx = cx
@@ -43,20 +44,30 @@ 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 &&
+        other.respond_to?(:unproxied) && @cx == other.unproxied &&
+        other.respond_to?(:database) && @database == other.database
+    end
+
+    alias_method :eql?, :==
+
+    def hash
+      [self.class, @cx, @database].hash
+    end
 
     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.pre.2"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-21 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -65,14 +65,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Allow ActiveRecord to share a connection to multiple databases on the same