active_record_proxy_adapters 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70250167498af840cadd4a35c83be8d093566e414c84c44b821c9d2e23dea3ca
-  data.tar.gz: '093ec59b4123dc6b695eff81f124fca929619cc9ed33709b2167fb01863fa3fb'
+  metadata.gz: e9709c38149a112c5203c15ed59fe97903484dcc7842c82e070c57d29fea21ed
+  data.tar.gz: f9054fc5ce575e3d0877a4aa3b3ba9cd59da532c4b30d85536e4f63318119aee
 SHA512:
-  metadata.gz: a782b3dea740b91f81c5f57a97cb9116343cbb990a41a80757d713e7893b5fa9d1565c730ed0eab8f55902a248551abcc5c8bfa6579ed51c3d5ae4d6e435eca5
-  data.tar.gz: 9fa48c67ac8da9ee1f9e4b1bacff13847eec8d1b8c3956bc6de822096b343e1d4ac2a65740ecf3525682e0d380fa6f928e0cdcd6c7255d101fcb03912392ed5b
+  metadata.gz: 7fe2bf87693040205f3e1aa62cc48b783d830b618d65423a4a8c3bae1dc029aae526d00227f5ca7ed4542dba04832641a86b2344ab6036956d3b2d9d1fc90b6b
+  data.tar.gz: 26c32105d9ed2c6f6d49016224284077207f780d0d3e56e62a59e81441808b1c00109f52c0baf867b09dba1a33a7aab2e12e4bc54b59789ddf288f0802e615cd

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -17,9 +17,24 @@ module ActiveRecordProxyAdapters
       connection.connection_class || ActiveRecord::Base
     end
 
+    # rubocop:disable Style/TrailingCommaInArrayLiteral
     def hijackable_methods
-      %i[exec_delete exec_insert exec_query exec_update execute select]
+      [
+        # Create
+        :insert,
+        :exec_insert_all, # this one is an exception to the rule. there's no higher-level equivalent method to be called
+        # Retrieve
+        :select,
+        # Update
+        :update,
+        # Delete
+        :delete,
+        # Generic
+        :exec_query,
+        :execute,
+      ]
     end
+    # rubocop:enable Style/TrailingCommaInArrayLiteral
 
     def active_record_v7?
       active_record_version >= Gem::Version.new("7.2") && active_record_version < Gem::Version.new("8.0")

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -102,7 +102,8 @@ module ActiveRecordProxyAdapters
     end
 
     def coerce_query_to_string(sql_or_arel)
-      sql_or_arel.respond_to?(:to_sql) ? sql_or_arel.to_sql : sql_or_arel.to_s
+      # TODO: implement custom Proxy arel parser
+      sql_or_arel.respond_to?(:to_sql) ? sql_or_arel.to_sql(connection_class) : sql_or_arel.to_s
     end
 
     def appropriate_connection(sql_string, &block)
@@ -173,7 +174,14 @@ module ActiveRecordProxyAdapters
 
       result
     ensure
-      replica_connection?(connection) && replica_pool.checkin(connection)
+      # Check the connection back into its own pool, not whatever pool currently
+      # answers to the :reading role. In Rails system tests,
+      # ActiveRecord::TestFixtures#setup_shared_connection_pool reassigns the
+      # :reading role's pool_config on every transactional-fixture test's
+      # before_setup, so re-resolving `replica_pool` here can return a pool
+      # different from the one the connection was checked out of — which would
+      # check a replica adapter into the primary pool and poison it.
+      connection.pool.checkin(connection) if replica_connection?(connection)
     end
 
     def connected_to(role:, &block)

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Matt Cruz