active_record_shards 5.2.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15b0d33ae1fec065fc2c2763f52bf5385da900ddbc3d8b55089ac6f1f99f9b1c
-  data.tar.gz: 61de1ca1ad18611d9eb059dcec55eb85e4de55c965dd3ee33c60088a5d68f4f2
+  metadata.gz: 032e2279ef2f82d2a1a30a171429a7b34b625766fe3a6060ad21141d551c0ca4
+  data.tar.gz: 169c3f8e0bf7d4f036a23106d8523b5e09756535f289be4da5ec295ec6c1605d
 SHA512:
-  metadata.gz: 90e52914b1a63fbfb633882f60f2c2020a057b7ad16530c5800cc44f2e88d551c638fcdc31615f2c1c13d4fd031148ce568a10d4776c0082b0c917e9c7ee8dba
-  data.tar.gz: 8b215a24c9c0e1ff79e75499b9d47976b0143095023c0ec2a1ab4c03cc5e9c048957ef63703fe2a8eef5b92c72b3d156a95662ac3367a67ec6324f9527142913
+  metadata.gz: c35a082c7b33926009467f10871177ecb02a2c5dc3b009a1f5d1a889fb49f039ea88bb931cdd80c7cc67763120158748610925ece6d53ee463020388a4690cc5
+  data.tar.gz: 4acc42ae93f573d60d12384f6f7454b4a85d1a5a13239491cb6b00a10d722dfb1534026119f845b3f8c39c5e0114500099eac6806cc2c8b6864c7c9f74835fde

data/lib/active_record_shards/connection_switcher.rb

@@ -4,6 +4,8 @@ require 'active_record_shards/shard_support'
 
 module ActiveRecordShards
   module ConnectionSwitcher
+    class LegacyConnectionHandlingError < StandardError; end
+
     case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
     when '6.1', '7.0'
       SHARD_NAMES_CONFIG_KEY = :shard_names
@@ -96,10 +98,9 @@ module ActiveRecordShards
     end
 
     def on_cx_switch_block(which, force: false, construct_ro_scope: nil, &block)
-      @disallow_replica ||= 0
-      @disallow_replica += 1 if which == :primary
+      self.disallow_replica += 1 if which == :primary
 
-      switch_to_replica = force || @disallow_replica.zero?
+      switch_to_replica = force || disallow_replica.zero?
       old_options = current_shard_selection.options
 
       switch_connection(replica: switch_to_replica)
@@ -112,10 +113,18 @@ module ActiveRecordShards
         readonly.scoping(&block)
       end
     ensure
-      @disallow_replica -= 1 if which == :primary
+      self.disallow_replica -= 1 if which == :primary
       switch_connection(old_options) if old_options
     end
 
+    def disallow_replica=(value)
+      Thread.current[:__active_record_shards__disallow_replica_by_thread] = value
+    end
+
+    def disallow_replica
+      Thread.current[:__active_record_shards__disallow_replica_by_thread] ||= 0
+    end
+
     def supports_sharding?
       shard_names.any?
     end
@@ -163,6 +172,8 @@ module ActiveRecordShards
     alias_method :check_config_for_env, :config_for_env
 
     def switch_connection(options)
+      ensure_legacy_connection_handling if ActiveRecord.version >= Gem::Version.new('6.1')
+
       if options.any?
         if options.key?(:replica)
           current_shard_selection.on_replica = options[:replica]
@@ -178,6 +189,22 @@ module ActiveRecordShards
       end
     end
 
+    def ensure_legacy_connection_handling
+      unless legacy_connection_handling_owner.legacy_connection_handling
+        raise LegacyConnectionHandlingError, "ActiveRecordShards is _only_ compatible with ActiveRecord `legacy_connection_handling` set to `true`."
+      end
+    end
+
+    def legacy_connection_handling_owner
+      @legacy_connection_handling_owner ||=
+        case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
+        when '7.0'
+          ActiveRecord
+        when '6.1'
+          ActiveRecord::Base
+        end
+    end
+
     def shard_env
       ActiveRecordShards.app_env
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -97,20 +97,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement