janus-ar 7.2.0 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9a0e04cbb2ece10c1a3fec2d0c1036788eaa290e36f5af3ea78812e8de6ac6c
-  data.tar.gz: 4cdf47f493d980f0c90b2bdb1d45468163cc58bf7d88c60956dc12e62dd2983d
+  metadata.gz: abaa44daa4820589fe37b9524a37a8190e9bb856b95498b0d66b6273ed3c8672
+  data.tar.gz: 100aa33fe074292a34dc758c64a122e16664a067a0117e976437dd1b415dceda
 SHA512:
-  metadata.gz: 1cc3b11d2a1f77ffd74c13fb61d9a6b012fa95375c030f93317be8a02052cc899c3750dbda3273efc4344e9bfc259c22d385842d9ad829ebde770ec3c911d969
-  data.tar.gz: 2abaface3c1b02a535a3b467b047ed03ab67ee5b57396363253fa975ab89b39cffaf0386b08968b9001f86623779b92ef31189cd91598242a31934ae1b71e8d9
+  metadata.gz: 452aebf630ed525f284d379b82d45b8f81665d44887fb21ee7d768e2310696446754df0c09b5d101dcd0142d9eab4cc3260fe0c06359e807f30652c186717fca
+  data.tar.gz: 9417eacddc58ec5f1bfc879b260d9a3f362f833db80f897efb634e1eade1ba185f7bc6461290551ef933971da0619652f7a24c783660d190f3985f28a65db3b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    janus-ar (7.2.0)
+    janus-ar (7.2.2)
       activerecord (~> 7.2)
 
 GEM
@@ -103,6 +103,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  x86_64-darwin-19
   x86_64-linux
 
 DEPENDENCIES

data/lib/janus-ar/active_record/connection_adapters/janus_mysql2_adapter.rb

@@ -54,10 +54,10 @@ module ActiveRecord
       def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: true)
         case where_to_send?(sql)
         when :all
-          send_to_replica(sql, connection: :all, method: :raw_execute)
+          send_to_replica(sql, connection: :all, name:)
           super
         when :replica
-          send_to_replica(sql, connection: :replica, method: :raw_execute)
+          send_to_replica(sql, connection: :replica, name:)
         else
           Janus::Context.stick_to_primary if write_query?(sql)
           Janus::Context.used_connection(:primary)
@@ -65,13 +65,13 @@ module ActiveRecord
         end
       end
 
-      def execute(sql)
+      def execute(sql, name = nil)
         case where_to_send?(sql)
         when :all
-          send_to_replica(sql, connection: :all, method: :execute)
+          send_to_replica(sql, connection: :all, method: :execute, name:)
           super(sql)
         when :replica
-          send_to_replica(sql, connection: :replica, method: :execute)
+          send_to_replica(sql, connection: :replica, method: :execute, name:)
         else
           Janus::Context.stick_to_primary if write_query?(sql)
           Janus::Context.used_connection(:primary)
@@ -79,17 +79,17 @@ module ActiveRecord
         end
       end
 
-      def execute_and_free(sql, name = nil, async: false)
+      def execute_and_free(sql, name = nil, async: false, allow_retry: false)
         case where_to_send?(sql)
         when :all
-          send_to_replica(sql, connection: :all, method: :execute)
+          send_to_replica(sql, connection: :all, name:)
           super(sql, name, async:)
         when :replica
-          send_to_replica(sql, connection: :replica, method: :execute)
+          send_to_replica(sql, connection: :replica, name:)
         else
           Janus::Context.stick_to_primary if write_query?(sql)
           Janus::Context.used_connection(:primary)
-          super(sql, name, async:)
+          super(sql, name, async:, allow_retry:)
         end
       end
 
@@ -123,14 +123,13 @@ module ActiveRecord
         Janus::QueryDirector.new(sql, open_transactions).where_to_send?
       end
 
-      def send_to_replica(sql, connection: nil, method: :exec_query)
+      def send_to_replica(sql, connection: nil, method: :exec_query, name:)
+        name ||= "SQL"
         Janus::Context.used_connection(connection) if connection
         if method == :execute
-          replica_connection.execute(sql)
-        elsif method == :raw_execute
-          replica_connection.execute(sql)
+          replica_connection.execute(sql, name)
         else
-          replica_connection.exec_query(sql)
+          replica_connection.exec_query(sql, name)
         end
       end
 

data/lib/janus-ar/active_record/connection_adapters/janus_trilogy_adapter.rb

@@ -75,17 +75,17 @@ module ActiveRecord
         end
       end
 
-      def execute_and_free(sql, name = nil, async: false)
+      def execute_and_free(sql, name = nil, async: false, allow_retry: false)
         case where_to_send?(sql)
         when :all
           send_to_replica(sql, connection: :all, method: :execute)
-          super(sql, name, async:)
+          super(sql, name, async:, allow_retry:)
         when :replica
           send_to_replica(sql, connection: :replica, method: :execute)
         else
           Janus::Context.stick_to_primary if write_query?(sql)
           Janus::Context.used_connection(:primary)
-          super(sql, name, async:)
+          super(sql, name, async:, allow_retry:)
         end
       end
 

data/lib/janus-ar/version.rb

@@ -5,7 +5,7 @@ module Janus
     module VERSION
       MAJOR = 7
       MINOR = 2
-      PATCH = 0
+      PATCH = 2
       PRE = nil
 
       def self.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: janus-ar
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.2
 platform: ruby
 authors:
 - Lloyd Watkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.23
 signing_key:
 specification_version: 4
 summary: Read/Write proxy for ActiveRecord using primary/replica databases