active_record_host_pool 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc285794dcf2d9fd3d54249bc94aea1a9ae64d76868040dc583aa669388cd444
-  data.tar.gz: fe57775f7b80266bddb5f019b48eb7f5a741a7a9f8e0858604e6a74e12df5501
+  metadata.gz: b012c288bdd269561992eb0a5a53310f7424f18102dae61655f97bc654bf146b
+  data.tar.gz: 9f3bdbda2e96929770dd6f9ad33293182d460e68a961a0a89370b3e2ca30a77d
 SHA512:
-  metadata.gz: 76037970cdd4288865b5e7e02d233d64699c60cc9054887465b21442e136da7f336d77623be76222ee45a75daac74b5e34581942793bf379fcb7df0b6229a4c4
-  data.tar.gz: e8ae94a9a9141891e5a4dbb0a61d08b13499546603b409f73d9a0de799112c68ca2705670a200c08cbb7ce3178135040808ac14323ac223afbc9519e21bff960
+  metadata.gz: d5540b9126209ea0a458ae8a5d3d96267cb449193a53d8798f34257b0e90dc8178faa2ef14e10477f4131f3619d7cf4406d1083f45b87ebe178b5b3c2ae1f72d
+  data.tar.gz: d314aca9726a5393a51921c9727df1caf688a0350abc6db0341cbc1b5d4dec5d5cec222384bd71ddb4f64fddd81f6da108fc6e2071cd016da2a48c104fd1b354

data/Changelog.md

@@ -6,7 +6,21 @@ and as of v1.0.0 this project adheres to [Semantic Versioning](https://semver.or
 
 ## [Unreleased]
 
+## [3.1.0]
+
+### Added
+- Calls `#clean!` on the connection after switching databases.
+
+## [3.0.0]
+
+### Added
+- Support and testing for Rails 7.2 & Rails main.
+
+### Removed
+- Support for ActiveRecord's legacy connection handling.
+
 ## [2.2.0]
+
 ### Removed
 - Support for Ruby 3.0.
 

data/lib/active_record_host_pool/connection_adapter_mixin.rb

@@ -8,7 +8,7 @@ when :trilogy
   when "6.1", "7.0"
     require "trilogy_adapter/connection"
     ActiveRecord::Base.extend(TrilogyAdapter::Connection)
-  when "7.1"
+  when "7.1", "7.2", "8.0"
     require "active_record/connection_adapters/trilogy_adapter"
   else
     raise "Unsupported version of Rails (v#{ActiveRecord::VERSION::STRING})"
@@ -17,29 +17,29 @@ end
 
 module ActiveRecordHostPool
   module DatabaseSwitch
-    attr_reader :_host_pool_current_database
+    attr_reader :_host_pool_desired_database
     def initialize(*)
       @_cached_current_database = nil
       super
     end
 
-    def _host_pool_current_database=(database)
-      @_host_pool_current_database = database
-      @config[:database] = _host_pool_current_database
+    def _host_pool_desired_database=(database)
+      @_host_pool_desired_database = database
+      @config[:database] = _host_pool_desired_database
     end
 
     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
+        if _host_pool_desired_database && !_no_switch
           _switch_connection
         end
         super
       end
     else
       def execute(...)
-        if _host_pool_current_database && !_no_switch
+        if _host_pool_desired_database && !_no_switch
           _switch_connection
         end
         super
@@ -71,30 +71,50 @@ module ActiveRecordHostPool
     attr_accessor :_no_switch
 
     def _switch_connection
-      if _host_pool_current_database &&
+      if _host_pool_desired_database &&
           (
-            (_host_pool_current_database != @_cached_current_database) ||
-            @connection.object_id != @_cached_connection_object_id
-          )
-        log("select_db #{_host_pool_current_database}", "SQL") do
+           _desired_database_changed? ||
+            _real_connection_changed?
+         )
+        log("select_db #{_host_pool_desired_database}", "SQL") do
           clear_cache!
-          raw_connection.select_db(_host_pool_current_database)
+          raw_connection.select_db(_host_pool_desired_database)
+          clean! if respond_to?(:clean)
         end
-        @_cached_current_database = _host_pool_current_database
-        @_cached_connection_object_id = @connection.object_id
+        @_cached_current_database = _host_pool_desired_database
+        @_cached_connection_object_id = _real_connection_object_id
       end
     end
 
+    def _desired_database_changed?
+      _host_pool_desired_database != @_cached_current_database
+    end
+
+    # rubocop:disable Lint/DuplicateMethods
+    case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+    when "6.1", "7.0", "7.1"
+      def _real_connection_object_id
+        @connection.object_id
+      end
+    else
+      def _real_connection_object_id
+        @raw_connection.object_id
+      end
+    end
+    # rubocop:enable Lint/DuplicateMethods
+
+    def _real_connection_changed?
+      _real_connection_object_id != @_cached_connection_object_id
+    end
+
     # prevent different databases from sharing the same query cache
     def cache_sql(sql, *args)
-      super(_host_pool_current_database.to_s + "/" + sql, *args)
+      super(_host_pool_desired_database.to_s + "/" + sql, *args)
     end
   end
 
   module PoolConfigPatch
     def pool
-      ActiveSupport::ForkTracker.check!
-
       @pool || synchronize { @pool ||= ActiveRecordHostPool::PoolProxy.new(self) }
     end
   end

data/lib/active_record_host_pool/connection_proxy.rb

@@ -14,7 +14,7 @@ module ActiveRecordHostPool
     end
 
     def __getobj__
-      @cx._host_pool_current_database = @database
+      @cx._host_pool_desired_database = @database
       @cx
     end
 

data/lib/active_record_host_pool/pool_proxy.rb

@@ -43,17 +43,35 @@ module ActiveRecordHostPool
 
     attr_reader :pool_config
 
-    def connection(*args)
-      real_connection = _unproxied_connection(*args)
-      _connection_proxy_for(real_connection, @config[:database])
-    rescue RESCUABLE_DB_ERROR, ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
-      _connection_pools.delete(_pool_key)
-      Kernel.raise
-    end
+    # rubocop:disable Lint/DuplicateMethods
+    case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+    when "6.1", "7.0", "7.1"
+      def connection(*args)
+        real_connection = _unproxied_connection(*args)
+        _connection_proxy_for(real_connection, @config[:database])
+      rescue RESCUABLE_DB_ERROR, ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
+        _connection_pools.delete(_pool_key)
+        Kernel.raise
+      end
+
+      def _unproxied_connection(*args)
+        _connection_pool.connection(*args)
+      end
+    else
+      def lease_connection(*args)
+        real_connection = _unproxied_connection(*args)
+        _connection_proxy_for(real_connection, @config[:database])
+      rescue RESCUABLE_DB_ERROR, ActiveRecord::NoDatabaseError, ActiveRecord::StatementInvalid
+        _connection_pools.delete(_pool_key)
+        Kernel.raise
+      end
+      alias_method :connection, :lease_connection
 
-    def _unproxied_connection(*args)
-      _connection_pool.connection(*args)
+      def _unproxied_connection(*args)
+        _connection_pool.lease_connection(*args)
+      end
     end
+    # rubocop:enable Lint/DuplicateMethods
 
     # 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
@@ -67,11 +85,48 @@ module ActiveRecordHostPool
       _connection_pool.checkin(cx)
     end
 
-    def with_connection
-      cx = checkout
-      yield cx
-    ensure
-      checkin cx
+    case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+    when "6.1", "7.0", "7.1"
+      def with_connection
+        cx = checkout
+        yield cx
+      ensure
+        checkin cx
+      end
+    else
+      def with_connection(prevent_permanent_checkout: false) # rubocop:disable Lint/DuplicateMethods
+        real_connection_lease = _connection_pool.send(:connection_lease)
+        sticky_was = real_connection_lease.sticky
+        real_connection_lease.sticky = false if prevent_permanent_checkout
+
+        if real_connection_lease.connection
+          begin
+            yield _connection_proxy_for(real_connection_lease.connection, @config[:database])
+          ensure
+            real_connection_lease.sticky = sticky_was if prevent_permanent_checkout && !sticky_was
+          end
+        else
+          begin
+            real_connection_lease.connection = _unproxied_connection
+            yield _connection_proxy_for(real_connection_lease.connection, @config[:database])
+          ensure
+            real_connection_lease.sticky = sticky_was if prevent_permanent_checkout && !sticky_was
+            _connection_pool.release_connection(real_connection_lease) unless real_connection_lease.sticky
+          end
+        end
+      end
+
+      def active_connection?
+        real_connection_lease = _connection_pool.send(:connection_lease)
+        if real_connection_lease.connection
+          _connection_proxy_for(real_connection_lease.connection, @config[:database])
+        end
+      end
+      alias_method :active_connection, :active_connection?
+
+      def schema_cache
+        @schema_cache ||= ActiveRecord::ConnectionAdapters::BoundSchemaReflection.new(_connection_pool.schema_reflection, self)
+      end
     end
 
     def disconnect!

data/lib/active_record_host_pool/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_host_pool
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-22 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord