janus-ar 7.2.1 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe497cf684bea34f818de566d7c7f88ed3c018b004a8d5b8787c05632b1cb0ec
-  data.tar.gz: df381e8a3639ca92c5b6775939c9ecf9ab157a390f78048de9cf769b8c17113a
+  metadata.gz: abaa44daa4820589fe37b9524a37a8190e9bb856b95498b0d66b6273ed3c8672
+  data.tar.gz: 100aa33fe074292a34dc758c64a122e16664a067a0117e976437dd1b415dceda
 SHA512:
-  metadata.gz: e7097e43fd387f258d638e073fde928e8b6c16f58d56dbcdff03ea37cc5c474a18b4326184d479878081e6e2995fcd165d429abe2d47c419fe716300f4d90ca8
-  data.tar.gz: 660f0a7cac355114fc105f190053c1daf56e9c1fde208e7ba18442a42413c6c357245defeeeb5f469d42377618c84127f671c825ff568ed17859c0126c7a1a7c
+  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)
@@ -82,10 +82,10 @@ module ActiveRecord
       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)
@@ -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/version.rb

@@ -5,7 +5,7 @@ module Janus
     module VERSION
       MAJOR = 7
       MINOR = 2
-      PATCH = 1
+      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.1
+  version: 7.2.2
 platform: ruby
 authors:
 - Lloyd Watkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-24 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord