active_record_proxy_adapters 0.3.3 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb04343dd0cca68ac16cbea842d12bc6c85b399883d132cf6b41c82623eb297f
-  data.tar.gz: 684848e566a132de37149d5873619b18a5a671cf7e86d3c09dd4b43d1d36c02e
+  metadata.gz: d809fc18be14439d41ac40e5a79bca83a41e01a1a032246f1faf6a4f44e4dbbe
+  data.tar.gz: 0f18779fd0a22e7bf3ffebe1021c5768aa70f4ab5a77420d094f780aae8b5ffa
 SHA512:
-  metadata.gz: c61315b442612b8ac1d28c13dd4d2bf70f7862b1cad438c3603693bec744f73c54dd031bf99da16863ed5caf171def7210f35274735077652799ab4a31c643a8
-  data.tar.gz: 7264ea8bdcfb2e58bd1fa1e61498f97503b9694a9b38ac9d04828b200756d476711085d3528d2b08b260de24d0b8a0f58ecbe10222a0431d4f7a6474d6ec5001
+  metadata.gz: 5adef0f03fd1d43a40edbd814888e75ec747cdf6e54439f2294fa69c31bf28d46c86a9c622d42e177d0761661f3a178c2eb88d47332354b6c3e2ddb158830dfb
+  data.tar.gz: 7ee20ca6500a8cda0ee0de89b658fc8694bb7383b73105e559c29b3e6c2a411aa0a0f099a98a636bbc59a91ee2f52145a6fbafdd4120722872900c9118de014b

data/lib/active_record/connection_adapters/mysql2_proxy_adapter.rb

@@ -15,7 +15,7 @@ module ActiveRecord
 
       ADAPTER_NAME = "Mysql2Proxy"
 
-      delegate_to_proxy :execute, :exec_query
+      delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)
 
       def initialize(...)
         @proxy = ActiveRecordProxyAdapters::Mysql2Proxy.new(self)

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/primary_replica_proxy.rb

@@ -18,19 +18,30 @@ 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
+    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
 
     # Abstract adapter methods that should be proxied.
-    hijack_method :execute, :exec_query
+    hijack_method(*ActiveRecordContext.hijackable_methods)
 
     def self.hijacked_methods
       @hijacked_methods.to_a
@@ -171,16 +182,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.3.3"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.5
 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