active_record_shards 5.3.3 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e71e05125d6c15ad696e8243cb09234c09d29e1c381b47adeee2a81b0b79e188
-  data.tar.gz: f06e143aabfc0e14d3058e03acc367e54d0219bcbf9355df57ee33e174393dbf
+  metadata.gz: fbcc8e394ddfa2267939c38fe1612c0c410f549ca6d45fc52469ccd564771fcd
+  data.tar.gz: 2e87a9063cfe63fe47d58d5bf8e7b84dc88755cb39f81b88db3954a8c5a65868
 SHA512:
-  metadata.gz: 60629cde5e087c941d9ce3d753a57c5d73f37cbd78d9e7b0f6f1d921834c25267371a0b2e957a92112eac3f295a837a2a41681cda63dc3a6bfd981811dfbcd91
-  data.tar.gz: 2c4e012130eead2088089cefb2204508141b3bd5056f733ccd26029fa053ae78b10b077750b64f5b364731b752842210086e368f813b3b1b333e9cdf2fecefb9
+  metadata.gz: 5eec3bce25a92f77f583a258efd2f054efce9f58b4e49c72be84e3cf352da02d7a8ab984ba349014dbe0f28b45cf347d2935512e97c88c349a9507b6338ce9f1
+  data.tar.gz: 4d9778bd1883639073fe77cf36a5de42de5d14ac1acd45303e80f4c37998a3c5ec00445578df9367a298c8d2c07111b2dd41e7cd6545b4e3f05f3b95d1eb2386

data/lib/active_record_shards/connection_switcher.rb

@@ -5,6 +5,7 @@ require 'active_record_shards/shard_support'
 module ActiveRecordShards
   module ConnectionSwitcher
     class LegacyConnectionHandlingError < StandardError; end
+    class IsolationLevelError < StandardError; end
 
     case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
     when '6.1', '7.0'
@@ -134,7 +135,8 @@ module ActiveRecordShards
     end
 
     def current_shard_selection
-      Thread.current[:shard_selection] ||= ShardSelection.new
+      cs = Thread.current.thread_variable_get(:shard_selection) || ShardSelection.new
+      Thread.current.thread_variable_set(:shard_selection, cs)
     end
 
     def current_shard_id
@@ -177,6 +179,7 @@ module ActiveRecordShards
 
     def switch_connection(options)
       ensure_legacy_connection_handling if ActiveRecord.version >= Gem::Version.new('6.1')
+      ensure_thread_isolation_level if ActiveRecord.version >= Gem::Version.new('7.0')
 
       if options.any?
         if options.key?(:replica)
@@ -199,6 +202,12 @@ module ActiveRecordShards
       end
     end
 
+    def ensure_thread_isolation_level
+      unless ActiveSupport::IsolatedExecutionState.isolation_level == :thread
+        raise IsolationLevelError, "ActiveRecordShards is _only_ compatible when ActiveSupport::IsolatedExecutionState's isolation_level is set to :thread"
+      end
+    end
+
     def legacy_connection_handling_owner
       @legacy_connection_handling_owner ||=
         case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"

data/lib/active_record_shards/default_replica_patches.rb

@@ -29,21 +29,6 @@ module ActiveRecordShards
       RUBY
     end
 
-    def transaction_with_replica_off(*args, &block)
-      if on_replica_by_default?
-        begin
-          old_val = Thread.current[:_active_record_shards_in_tx]
-          Thread.current[:_active_record_shards_in_tx] = true
-          transaction_without_replica_off(*args, &block)
-        ensure
-          Thread.current[:_active_record_shards_in_tx] = old_val
-        end
-      else
-        transaction_without_replica_off(*args, &block)
-      end
-    end
-    ruby2_keywords(:transaction_with_replica_off) if respond_to?(:ruby2_keywords, true)
-
     module InstanceMethods
       def on_replica_unless_tx
         self.class.on_replica_unless_tx { yield }
@@ -80,17 +65,12 @@ module ActiveRecordShards
 
       base.class_eval do
         include InstanceMethods
-
-        class << self
-          alias_method :transaction_without_replica_off, :transaction
-          alias_method :transaction, :transaction_with_replica_off
-        end
       end
     end
 
     def on_replica_unless_tx(&block)
       return yield if Thread.current[:_active_record_shards_in_migration]
-      return yield if Thread.current[:_active_record_shards_in_tx]
+      return yield if _in_transaction?
 
       if on_replica_by_default?
         on_replica(&block)
@@ -99,6 +79,10 @@ module ActiveRecordShards
       end
     end
 
+    def _in_transaction?
+      connected? && connection.transaction_open?
+    end
+
     def force_on_replica(&block)
       return yield if Thread.current[:_active_record_shards_in_migration]
 
@@ -122,7 +106,7 @@ module ActiveRecordShards
     module Rails52RelationPatches
       def connection
         return super if Thread.current[:_active_record_shards_in_migration]
-        return super if Thread.current[:_active_record_shards_in_tx]
+        return super if _in_transaction?
 
         if @klass.on_replica_by_default?
           @klass.on_replica.connection
@@ -214,7 +198,7 @@ module ActiveRecordShards
     module TypeCasterConnectionConnectionPatch
       def connection
         return super if Thread.current[:_active_record_shards_in_migration]
-        return super if Thread.current[:_active_record_shards_in_tx]
+        return super if ActiveRecord::Base._in_transaction?
 
         if @klass.on_replica_by_default?
           @klass.on_replica.connection

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.3.3
+  version: 5.4.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -83,20 +83,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.0
-- !ruby/object:Gem::Dependency
-  name: minitest-rg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement