active_record_proxy_adapters 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e148061bb9e9c3f549699194ae0f5cc243beb00313c60ffba5bb07e19caaaec
-  data.tar.gz: bf49b5c9154c47fb72feaa70707db1f199270c8f36e4363e611093abd0fea6dd
+  metadata.gz: 77eed2693b334a1796b09c3484d8b8565a1f19b4ade6fb0f389cd0590bd69bac
+  data.tar.gz: 476c02aa9212953b5c877c2ccaf756731f400bf5bfe80b62f048cab8bab88d8f
 SHA512:
-  metadata.gz: d97bd25dd696d9325855ee9f44ee7a2355e67bed17921040532ece5813e7d48d9196fac2cf35d7b100a7dd34759be4709ed1cb98f9e362bf7c1c1ec8fb226e8a
-  data.tar.gz: c082ceb7dc739e3de7347affe26d59dfdf4cf1a0daad731096362f5b4374847f038460c5919d01bc40abe2ac2a70107f10021d31541cbdc3210c681657a59818
+  metadata.gz: 7d501fae8d20e0fd50c9cca5151baa291573c7bb0feeb79c249feb0dd8810a0b0994c3b68133e39be4cecc5b9f92f375187b98f9c90f00bc42c38edafa19204b
+  data.tar.gz: a145dc2b7767f033aeb7eda886d2fbae8adbcb46a0c3a44872cf8a5d1b1a03a3d4a562431189192af5fc6f7da9a5233118d0f7ae03f11b53316ff3af83858182

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.2.5"
+  VERSION = "0.2.6"
 end

metadata

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