active_record_proxy_adapters 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0650c0793e1af3d7f06f1da1708cc590942468daca491353b57a74575926a5e2
-  data.tar.gz: 44cd716171d8a8d2d430ac8ae3780f54634ecdf1ae1014ca09720f9fef95bf5b
+  metadata.gz: bc6ba1c7e7067f2807918d4afe2433c3bd2f060a28800ef9a6d543d94e592c7d
+  data.tar.gz: 7fd1f37ef4884d0305bdbd8d3e792f52f8fd257c0353f51392c3a9f308e88313
 SHA512:
-  metadata.gz: 68b00c13361168d78b70752002443988132725b013330d1e1161277f73c1a808f0153e76e6fb397bc7dd23c9bc8ba108a6c99ec3bdfc60d45f59a2c47902f693
-  data.tar.gz: a2bb48e98f0a57bb4f4546ca5bf821be670205a50a0b2ec439a79c98e3db1e43c28b63fe90c7d5849ba0ae048b4b20300658ce7fee62dd874e345c9ac50a0e86
+  metadata.gz: b6800509cbe6c11b7ff220691659880b80eb2cb7ad9d3644ec2a2853cd2197ab3648dcc57642c7e99b9d8d7d5ee090e4c25087d3f2a307bac3ada30085e576bd
+  data.tar.gz: 210ec622d9a4e60bdf47903b6040719d7adad82f941e9f9c6c5b71c9ecace12a6e0b068fb0b9d7de30c37524236f6a755b24e16c7b81a956b70a15fa761a4a54

data/lib/active_record/connection_adapters/postgresql_proxy_adapter.rb

@@ -15,7 +15,7 @@ module ActiveRecord
 
       ADAPTER_NAME = "PostgreSQLProxy"
 
-      delegate_to_proxy :execute, :exec_query
+      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
 
       unless ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v8_0_or_greater?
         delegate_to_proxy :exec_no_cache, :exec_cache

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -23,6 +23,8 @@ module ActiveRecordProxyAdapters
     end
 
     def connection_class_for(connection)
+      return connection.connection_descriptor.name.constantize if active_record_v8_0_2_or_greater?
+
       connection.connection_class || ActiveRecord::Base
     end
 
@@ -33,6 +35,18 @@ module ActiveRecordProxyAdapters
       ActiveRecord
     end
 
+    def hijackable_methods
+      hijackable = %i[execute exec_query]
+
+      hijackable << :internal_exec_query if active_record_v8_0_or_greater?
+
+      hijackable
+    end
+
+    def active_record_v7?
+      active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("8.0")
+    end
+
     def active_record_v7_1_or_greater?
       active_record_version >= Gem::Version.new("7.1")
     end
@@ -44,5 +58,9 @@ module ActiveRecordProxyAdapters
     def active_record_v8_0_or_greater?
       active_record_version >= Gem::Version.new("8.0")
     end
+
+    def active_record_v8_0_2_or_greater?
+      active_record_version >= Gem::Version.new("8.0.2")
+    end
   end
 end

data/lib/active_record_proxy_adapters/postgresql_proxy.rb

@@ -7,7 +7,7 @@ module ActiveRecordProxyAdapters
   # Proxy to the original PostgreSQLAdapter, allowing the use of the ActiveRecordProxyAdapters::PrimaryReplicaProxy.
   class PostgreSQLProxy < PrimaryReplicaProxy
     # ActiveRecord::PostgreSQLAdapter methods that should be proxied.
-    hijack_method :execute, :exec_query
+    hijack_method(*ActiveRecordContext.hijackable_methods)
 
     hijack_method :exec_no_cache, :exec_cache unless ActiveRecordContext.active_record_v8_0_or_greater?
   end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -65,6 +65,22 @@ module ActiveRecordProxyAdapters
     delegate :connection_handler, to: :connection_class
     delegate :reading_role, :writing_role, to: :active_record_context
 
+    # We need to call .verify! to ensure `configure_connection` is called on the instance before attempting to use it.
+    # This is necessary because the connection may have been lazily initialized and is an unintended side effect from a
+    # change in Rails to defer connection verification: https://github.com/rails/rails/pull/44576
+    # verify! cannot be called before the object is initialized and because of how the proxy hooks into the connection
+    # instance, it has to be done lazily (hence the memoization). Ideally, we shouldn't have to worry about this at all
+    # But there is tight coupling between methods in ActiveRecord::ConnectionAdapters::AbstractAdapter and
+    # its descendants which will require significant refactoring to be decoupled.
+    # See https://github.com/rails/rails/issues/51780
+    def verified_primary_connection
+      @verified_primary_connection ||= begin
+        connected_to(role: writing_role) { primary_connection.verify! }
+
+        primary_connection
+      end
+    end
+
     def replica_pool_unavailable?
       !replica_pool
     end
@@ -135,7 +151,8 @@ module ActiveRecordProxyAdapters
     end
 
     def connection_for(role, sql_string)
-      connection = primary_connection if role == writing_role || replica_pool_unavailable?
+      connection = verified_primary_connection if role == writing_role || replica_pool_unavailable?
+
       connection ||= checkout_replica_connection
 
       result = connected_to(role:) { yield connection }

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Matt Cruz
 bindir: exe
 cert_chain: []
-date: 2025-02-25 00:00:00.000000000 Z
+date: 2025-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord