resilient_reads 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56b29303c6173728af9204eaa7b2b4c2ed73a5b6d7e6e3100d8e23bbc2afc2ae
-  data.tar.gz: 813d2268fd80a7835c2c4744eca2f4a6f879645049305ec02df71443b8329d47
+  metadata.gz: 1fe8df35a3f61180a19739623b0aaff7bbbe294243ad427c009582ed1c8a318c
+  data.tar.gz: fb4714db90a83396646d513a9d017f38882ed908d063becd504144376d094c5d
 SHA512:
-  metadata.gz: 32e222767e097b4735a534a2cf4f1be7edc4e15214e3ccdcb1135c277170023d134228fea85efe0068882ed6a9549e961f9d8cc8270dc71ca371c7ae7a83dc5e
-  data.tar.gz: 7e4da86bf77656e5b948446314f2841ce1aa64f4ef01cb980ad5b59eb678cf8291b335d6372d63cdf2a9f90dcb90f446a8caf91b6e7c692e1a2c9f0dcf4fd5b3
+  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/replica.rb

@@ -85,8 +85,16 @@ module ResilientReads
     end
 
     # Verify the replica is reachable. Returns true/false and updates health.
+    # Uses the raw connection to avoid ActiveRecord SQL instrumentation/logging.
     def check_health!
-      @connection_class.connection.execute("SELECT 1")
+      raw = @connection_class.connection.raw_connection
+      if raw.respond_to?(:exec)         # PG::Connection
+        raw.exec("SELECT 1")
+      elsif raw.respond_to?(:ping)      # Mysql2::Client / Trilogy
+        raw.ping
+      else
+        @connection_class.connection.execute("SELECT 1")
+      end
       mark_healthy!
       true
     rescue => e

data/lib/resilient_reads/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: resilient_reads
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Jamie Puckett
 bindir: exe
 cert_chain: []
-date: 1980-01-02 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.
@@ -59,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Distribute database reads across multiple replicas in Rails with automatic
   load balancing, health checking, and graceful failover to primary.