active_record_proxy_adapters 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7644e3cfd1692bbfdbb0bed3e8f92e890599c1c5ad9eb98e76382d49799fe4df
-  data.tar.gz: 9476ebb441475da928efd5e2cfdbe46d40cca195f44817a3fa8c9af7bf649483
+  metadata.gz: 38a1c803b775efa6be98d75f5ba3b7e2851724256a5c738fc6706d69e7ecf1cb
+  data.tar.gz: b0d6768c564347b4187b4ea3a66e0facc6dbf242ec59cb92a4ce7fd7d9182d73
 SHA512:
-  metadata.gz: 845fc0f94284a9a4835533ef9a47a10805c5fb6591fd3e71201b384a9c8dda4e9b6fe13cfd6e7ba55d72dfea0845d8e338bcf64bc52873c207e4a0da9f5081a2
-  data.tar.gz: d660b61a37f6a356df0a1bd44d66e3b5a642e8f4c5e60ce7126da2ea6c789eeb523e83d565aa343d59bbf651710e93d7a3f445901ea390e135213b557dc8b214
+  metadata.gz: 0e076ea30e7860afcae92bfe7156b49bd39f7c644fdc1195191decf960eb6d534c053d16322db1c78e09daad5a766492cf57ba844620ccf8c3de5a87e2aa2b45
+  data.tar.gz: 101005780f17799ee9c34560c7f99893ee8d0e19194c6b5922e48cf5aec2a4af24eafba0691bff380e71623068b7b16a87c27d78849573dd4fae19f6a6c4687d

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

@@ -15,17 +15,29 @@ module ActiveRecordProxyAdapters
       /\A\s*select.+for update\Z/i, /select.+lock in share mode\Z/i,
       /\A\s*select.+(nextval|currval|lastval|get_lock|release_lock|pg_advisory_lock|pg_advisory_unlock)\(/i
     ].map(&:freeze).freeze
+
+    CTE_MATCHER = /\A\s*WITH\s+(?<CTE>\S+\s+AS\s+\(\s?[\s\S]*\))/i
     # All queries that match these patterns should be sent to the replica database
-    SQL_REPLICA_MATCHERS     = [/\A\s*(select|with\s[\s\S]*\)\s*select)\s/i].map(&:freeze).freeze
+    SQL_REPLICA_MATCHERS = [
+      /\A\s*(select)\s/i,
+      /#{CTE_MATCHER.source}\s*select/i
+    ].map(&:freeze).freeze
     # All queries that match these patterns should be sent to all databases
     SQL_ALL_MATCHERS         = [/\A\s*set\s/i].map(&:freeze).freeze
     # Local sets queries should not be sent to all datbases
     SQL_SKIP_ALL_MATCHERS    = [/\A\s*set\s+local\s/i].map(&:freeze).freeze
     # These patterns define which database statments are considered write statments, so we can shortly re-route all
     # requests to the primary database so the replica has time to replicate
-    WRITE_STATEMENT_MATCHERS = [/\ABEGIN/i, /\ACOMMIT/i, /INSERT\sINTO\s/i, /UPDATE\s/i, /DELETE\sFROM\s/i,
-                                /DROP\s/i].map(&:freeze).freeze
-    UNPROXIED_METHOD_SUFFIX  = "_unproxied"
+    WRITE_STATEMENT_MATCHERS = [
+      /\ABEGIN/i,
+      /\ACOMMIT/i,
+      /INSERT\s[\s\S]*INTO\s[\s\S]*/i,
+      /UPDATE\s[\s\S]*/i,
+      /DELETE\s[\s\S]*FROM\s[\s\S]*/i,
+      /DROP\s/i
+    ].map(&:freeze).freeze
+
+    UNPROXIED_METHOD_SUFFIX = "_unproxied"
 
     # Defines which methods should be hijacked from the original adapter and use the proxy
     # @param method_names [Array<Symbol>] the list of method names from the adapter
@@ -186,16 +198,21 @@ module ActiveRecordProxyAdapters
     # @return [TrueClass] if there has been a write within the last {#proxy_delay} seconds
     # @return [TrueClass] if sql_string matches a write statement (i.e. INSERT, UPDATE, DELETE, SELECT FOR UPDATE)
     # @return [FalseClass] if sql_string matches a read statement (i.e. SELECT)
-    def need_primary?(sql_string)
-      return true if recent_write_to_primary?
-
+    def need_primary?(sql_string) # rubocop:disable Metrics/CyclomaticComplexity
+      return true  if recent_write_to_primary?
       return true  if in_transaction?
+      return true  if cte_for_write?(sql_string)
       return true  if SQL_PRIMARY_MATCHERS.any?(&match_sql?(sql_string))
       return false if SQL_REPLICA_MATCHERS.any?(&match_sql?(sql_string))
 
       true
     end
 
+    def cte_for_write?(sql_string)
+      CTE_MATCHER.match?(sql_string) &&
+        WRITE_STATEMENT_MATCHERS.any?(&match_sql?(sql_string))
+    end
+
     def need_all?(sql_string)
       return false if SQL_SKIP_ALL_MATCHERS.any?(&match_sql?(sql_string))
 

data/lib/active_record_proxy_adapters/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Matt Cruz
 bindir: exe
 cert_chain: []
-date: 2025-03-04 00:00:00.000000000 Z
+date: 2025-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord