resilient_reads 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a7b3f39e250957ac840a69af135911e9e466e1c1a656eaf965701b63cb5e9b
-  data.tar.gz: 14c6ca6f9bd822cafc53e3cfa39562284ca4fffa3e2f8169ae0684fbac7ea1bf
+  metadata.gz: 1fe8df35a3f61180a19739623b0aaff7bbbe294243ad427c009582ed1c8a318c
+  data.tar.gz: fb4714db90a83396646d513a9d017f38882ed908d063becd504144376d094c5d
 SHA512:
-  metadata.gz: 959af6f366c6bd99e6e37570c450b30746c197a87daa2448b83549cf53b166782e3e73582a740f346768e10d98e84f0bd5424cac39477fbeab630a90f1be0fe3
-  data.tar.gz: 7b001e842fb6828491541f565a71b8a952a0435a4ad5de9faafe38076519196a858aa17f1113c9309479711fda07eaf0b2a8f8aa0d26da35a5495fedb0f8b21d
+  metadata.gz: b5e1659a0280bba649717303fc25d0f5188a7c8660dda88fc4e4857fc6a102eaba2a65259ce07f641338164f6876cb53ddd438d9cf318191acb471998cc166d8
+  data.tar.gz: 05542c3105b4eccd0092e1242524fb88dd37804d0f7757c8b9255d36aec2cdb95181a7a80a835e3ec777745def2118fd61416757c06ac13370c4a11f2be85142

data/lib/resilient_reads/adapter_patch.rb

@@ -11,7 +11,7 @@ module ResilientReads
     # Query names that should never be routed to a replica. These are
     # schema introspection or internal bookkeeping queries that run during
     # model loading and connection setup.
-    SKIP_NAMES = Set.new(%w[SCHEMA EXPLAIN]).freeze
+    SKIP_NAMES = Set.new(%w[SCHEMA EXPLAIN TRANSACTION]).freeze
 
     # SQL clauses that acquire locks and must execute on the primary,
     # even though the statement starts with SELECT.
@@ -31,15 +31,21 @@ module ResilientReads
 
         execute_on_replica(sql, ctx, *args, **kwargs)
       else
-        if ctx && ctx[:distributing]
-          if write_query?(sql)
-            # Sticky writes: after any write inside a distribute_reads
+        if ctx && ctx[:distributing] && !ctx[:on_replica]
+          adapter_write = write_query?(sql)
+
+          if adapter_write || ResilientReads.write_query?(sql)
+            # Sticky writes: after any DML write inside a distribute_reads
             # block, all subsequent reads stay on primary for the rest of
             # the block.  This prevents stale-read → conflicting-write
             # chains that cause MySQL/InnoDB deadlocks, especially with
             # transactionless writes like update_column that don't bump
             # open_transactions.
-            if ResilientReads.config.sticky_writes
+            #
+            # Only adapter-detected writes (DML/DDL) trigger sticky —
+            # transaction commands (BEGIN/COMMIT) are handled by the
+            # open_transactions guard instead.
+            if ResilientReads.config.sticky_writes && adapter_write
               ctx[:stick_to_primary] = true
             end
             ResilientReads.log_query("primary", sql, name, reason: "write query")
@@ -53,12 +59,17 @@ module ResilientReads
 
     private
 
-    # Schema queries, internal queries, and queries without a name
-    # (connection setup, etc.) should always hit the primary.
+    # Queries that must stay on the primary: writes, transaction
+    # commands, schema introspection, and locking reads.
+    #
+    # We check *both* the adapter's write_query? (which knows about
+    # adapter-specific DDL/DML) and ResilientReads' own WRITE_PATTERN
+    # (which catches transaction commands like BEGIN/COMMIT/SET that
+    # some adapters classify as reads).
     def skip_replica_routing?(sql, name)
-      return true if name.nil? || name == ""
-      return true if SKIP_NAMES.include?(name)
+      return true if name && SKIP_NAMES.include?(name)
       return true if write_query?(sql)
+      return true if ResilientReads.write_query?(sql)
       return true if locking_query?(sql)
       false
     end
@@ -87,8 +98,18 @@ module ResilientReads
       end
 
       # Optional lag check — uses cached value to avoid querying on every request.
+      # The routing guard must be set while the lag query runs so that the
+      # replica adapter's patched raw_execute doesn't re-enter
+      # execute_on_replica (the lag SQL is a SELECT executed on the replica
+      # connection, which would otherwise pass skip_replica_routing? and
+      # recurse infinitely).
       if ResilientReads.config.max_lag
-        lag = replica.cached_lag
+        ctx[:routing] = true
+        begin
+          lag = replica.cached_lag
+        ensure
+          ctx[:routing] = false
+        end
         if lag && lag > ResilientReads.config.max_lag
           if ResilientReads.config.lag_failover
             ResilientReads.log_query("primary", sql, args.first, reason: "replica '#{replica.name}' lag #{lag.round(1)}s > max #{ResilientReads.config.max_lag}s")

data/lib/resilient_reads/version.rb

@@ -1,3 +1,3 @@
 module ResilientReads
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/resilient_reads.rb

@@ -111,7 +111,7 @@ module ResilientReads
       logger = config.logger
       return unless logger
 
-      # logger.public_send(level, "[ResilientReads] #{message}")
+      logger.public_send(level, "[ResilientReads] #{message}")
     rescue
       # Never let logging break query flow.
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: resilient_reads
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jamie Puckett
 bindir: exe
 cert_chain: []
-date: 2026-06-19 00:00:00.000000000 Z
+date: 2026-06-20 00:00:00.000000000 Z
 dependencies: []
 description: Distribute database reads across multiple replicas in Rails with automatic
   load balancing, health checking, and graceful failover to primary.