active_record_proxy_adapters 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed0b02df3f4b3700b42b1e89b4449470cec256cf2657276c9584aab3dc8165d
-  data.tar.gz: e041a155d835a4a5f0919e8883fba2e863e68ec713c92e8759d362c22d667ac1
+  metadata.gz: bfb8746fdc07a5d8be73c0d9f49c0f1602705dc77d2f4a0d7fda5c4f7b5a9802
+  data.tar.gz: 217ca38e811ab142dfb14feff31cf049758d8e38bc99149d958ce7bf29bbb42a
 SHA512:
-  metadata.gz: 0e41b26de72871a04777ecd533c2172531fa32d0718a641f640aab5b6eda0bc1adfa3b255fca31d0d961a25994bf51409e1c0cbd87044d77447be62dd779afde
-  data.tar.gz: a6f0ede11a734a907999a597bc9d538742bc26830e1b4d9e0191fd7577e803c388a8c91220f4562c457f957c92dde5208defa2a0b0cd8d01a02fdddba00f2fb0
+  metadata.gz: 30a9e38fd88738fb2a7f56525a7c501fe65c29d4e86635ca0e82c4fa0c64a3101471b204a10426740337add1c85a13dbfe00815807cb14d42a64d0788150fe3d
+  data.tar.gz: 1a9ed7079d6f4369c3baf1718776a6880772bea01790aac15f27326966378950b06d22826fef14d45a5460cc21c2d999add646af125178986f9e53474ff2fa5b

data/lib/active_record/connection_adapters/mysql2_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "active_record/tasks/mysql2_proxy_database_tasks"
-require "active_record/connection_adapters/mysql2_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/mysql2_proxy"
+require "active_record/connection_adapters/mysql2_adapter"
+require "active_record/tasks/mysql2_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,6 +13,12 @@ module ActiveRecord
     class Mysql2ProxyAdapter < Mysql2Adapter
       include ActiveRecordProxyAdapters::Hijackable
 
+      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
+        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
+
+        include ActiveRecordProxyAdapters::TransactionableProxyAR70
+      end
+
       ADAPTER_NAME = "Mysql2Proxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record/connection_adapters/postgresql_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "active_record/tasks/postgresql_proxy_database_tasks"
-require "active_record/connection_adapters/postgresql_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/postgresql_proxy"
+require "active_record/connection_adapters/postgresql_adapter"
+require "active_record/tasks/postgresql_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,6 +13,12 @@ module ActiveRecord
     class PostgreSQLProxyAdapter < PostgreSQLAdapter
       include ActiveRecordProxyAdapters::Hijackable
 
+      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
+        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
+
+        include ActiveRecordProxyAdapters::TransactionableProxyAR70
+      end
+
       ADAPTER_NAME = "PostgreSQLProxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record/connection_adapters/trilogy_proxy_adapter.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require "active_record/tasks/trilogy_proxy_database_tasks"
-require "active_record/connection_adapters/trilogy_adapter"
 require "active_record_proxy_adapters/active_record_context"
 require "active_record_proxy_adapters/hijackable"
 require "active_record_proxy_adapters/trilogy_proxy"
+require "active_record/connection_adapters/trilogy_adapter"
+require "active_record/tasks/trilogy_proxy_database_tasks"
 
 module ActiveRecord
   module ConnectionAdapters
@@ -13,6 +13,12 @@ module ActiveRecord
     class TrilogyProxyAdapter < TrilogyAdapter
       include ActiveRecordProxyAdapters::Hijackable
 
+      if ActiveRecordProxyAdapters::ActiveRecordContext.active_record_v7_0?
+        require "active_record_proxy_adapters/transactionable_proxy_a_r_70"
+
+        include ActiveRecordProxyAdapters::TransactionableProxyAR70
+      end
+
       ADAPTER_NAME = "TrilogyProxy"
 
       delegate_to_proxy(*ActiveRecordProxyAdapters::ActiveRecordContext.hijackable_methods)

data/lib/active_record_proxy_adapters/active_record_context.rb

@@ -47,6 +47,10 @@ module ActiveRecordProxyAdapters
       active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("8.0")
     end
 
+    def active_record_v7_0?
+      active_record_version >= Gem::Version.new("7.0") && active_record_version < Gem::Version.new("7.1")
+    end
+
     def active_record_v7_1_or_greater?
       active_record_version >= Gem::Version.new("7.1")
     end

data/lib/active_record_proxy_adapters/hijackable.rb

@@ -52,8 +52,6 @@ module ActiveRecordProxyAdapters
         "_unproxied"
       end
 
-      private
-
       def proxy_method_name_for(method_name)
         :"#{method_name}#{unproxied_method_suffix}"
       end
@@ -63,6 +61,10 @@ module ActiveRecordProxyAdapters
       def unproxied_method_suffix
         self.class.unproxied_method_suffix
       end
+
+      def proxy_method_name_for(method_name)
+        self.class.proxy_method_name_for(method_name)
+      end
     end
   end
 end

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -34,6 +34,7 @@ module ActiveRecordProxyAdapters
     WRITE_STATEMENT_MATCHERS = [
       /\ABEGIN/i,
       /\ACOMMIT/i,
+      /\AROLLBACK/i,
       /INSERT\s[\s\S]*INTO\s[\s\S]*/i,
       /UPDATE\s[\s\S]*/i,
       /DELETE\s[\s\S]*FROM\s[\s\S]*/i,

data/lib/active_record_proxy_adapters/transactionable_proxy_a_r_70.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ActiveRecordProxyAdapters
+  module TransactionableProxyAR70 # rubocop:disable Style/Documentation
+    extend ActiveSupport::Concern
+
+    included do
+      def begin_db_transaction # :nodoc:
+        bypass_proxy_or_else("BEGIN", "TRANSACTION") { super }
+      end
+
+      def commit_db_transaction # :nodoc:
+        bypass_proxy_or_else("COMMIT", "TRANSACTION") { super }
+      end
+
+      def exec_rollback_db_transaction # :nodoc:
+        bypass_proxy_or_else("ROLLBACK", "TRANSACTION") { super }
+      end
+
+      private
+
+      def bypass_proxy_or_else(*args)
+        method_name = proxy_method_name_for(:execute)
+
+        return public_send(method_name, *args) if respond_to?(method_name)
+
+        yield
+      end
+    end
+  end
+end

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.4.6"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Matt Cruz
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -58,8 +58,8 @@ email:
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.md
 - LICENSE.txt
+- README.md
 files:
 - LICENSE.txt
 - README.md
@@ -83,6 +83,7 @@ files:
 - lib/active_record_proxy_adapters/postgresql_proxy.rb
 - lib/active_record_proxy_adapters/primary_replica_proxy.rb
 - lib/active_record_proxy_adapters/railtie.rb
+- lib/active_record_proxy_adapters/transactionable_proxy_a_r_70.rb
 - lib/active_record_proxy_adapters/trilogy_proxy.rb
 - lib/active_record_proxy_adapters/version.rb
 homepage: https://github.com/Nasdaq/active_record_proxy_adapters
@@ -108,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Read replica proxy adapters for ActiveRecord!
 test_files: []