active_record_proxy_adapters 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7884786c370072543b8702a379b372ffa878e281e88e8e96ba603cec78a01523
-  data.tar.gz: 80141eaa2a1e1bbd9c4eb985136140acf006c16e5749497a114574f809325e98
+  metadata.gz: d73a2213222b1689c5ff581f40e561974446e480355d582fca5daa04eccf9996
+  data.tar.gz: ee667c46d62816df1dafbe583cbe0503448097f30ebf7c6d37565fd6cb335779
 SHA512:
-  metadata.gz: 7f89bd7a1edf1e8813a9b70610c0153603958b64dbcecd5a00cc506301819e774b45ff291b06cfe01d8f25d2db6763853cb2bac4462d98836c33fbada30231b5
-  data.tar.gz: b7db70493adab591fd31c4294a630ff976e7cefac58a2e466f2e5cb6511102b1900054fbbc6d632a59cac8875f1f047d4ad0c78a5385f669987ec48bc8420651
+  metadata.gz: a0c1db04e45da543ff86f31a37b45a5f3c5a3e31d0c877cd7e0038f46d01207bf90124868dda9a89ce73a0701726e9c539a422ef53a6e3a9cac9f2304e20a4de
+  data.tar.gz: 1e7eeb8e61c753dd6ad8475a61c4625c90240cdf1d2cf544b40c215a34ec498df806e8403922728c579f5dc727ea5901ff9e81875a57a36fcb2f1fbb17ec4b08

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

@@ -49,6 +49,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.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Matt Cruz
@@ -103,6 +103,7 @@ files:
 - lib/active_record_proxy_adapters/railtie.rb
 - lib/active_record_proxy_adapters/sqlite3_proxy.rb
 - lib/active_record_proxy_adapters/synchronizable_configuration.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