active_record_proxy_adapters 0.10.2 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70250167498af840cadd4a35c83be8d093566e414c84c44b821c9d2e23dea3ca
-  data.tar.gz: '093ec59b4123dc6b695eff81f124fca929619cc9ed33709b2167fb01863fa3fb'
+  metadata.gz: 8af46e249283bd304b76cd6f92c4ebd8547078c29529e63a39c04c90ace297d2
+  data.tar.gz: c3753aaf59899dd7f97b288b4ead7f478a9341a32afba0e4603125e860956ad9
 SHA512:
-  metadata.gz: a782b3dea740b91f81c5f57a97cb9116343cbb990a41a80757d713e7893b5fa9d1565c730ed0eab8f55902a248551abcc5c8bfa6579ed51c3d5ae4d6e435eca5
-  data.tar.gz: 9fa48c67ac8da9ee1f9e4b1bacff13847eec8d1b8c3956bc6de822096b343e1d4ac2a65740ecf3525682e0d380fa6f928e0cdcd6c7255d101fcb03912392ed5b
+  metadata.gz: 34eebec75d208cf8cc8226382dfe26b7e63e88e0e5c4ebbc802259875c0972b51346aabdf92c82ef912bcef92ba06933a54ccfa30060e31d69d2791e8bcb4fa6
+  data.tar.gz: e07490e7946807c07d626c43932ea1996349048ee953a1a407d7048c382446eb984530db358ff916d8c46f5548828a8325271399b92b4ac9a4db7ea563bae287

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)
@@ -172,8 +173,6 @@ module ActiveRecordProxyAdapters
       update_primary_latest_write_timestamp if !replica_connection?(connection) && write_statement?(sql_string)
 
       result
-    ensure
-      replica_connection?(connection) && replica_pool.checkin(connection)
     end
 
     def connected_to(role:, &block)
@@ -187,7 +186,7 @@ module ActiveRecordProxyAdapters
     end
 
     def checkout_replica_connection
-      replica_pool.checkout(proxy_checkout_timeout)
+      replica_pool.lease_connection
     # rescue NoDatabaseError to avoid crashing when running db:create rake task
     # rescue ConnectionNotEstablished to handle connectivity issues in the replica
     # (for example, replication delay)

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.1"
 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.1
 platform: ruby
 authors:
 - Matt Cruz