active_record_shards 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbcc8e394ddfa2267939c38fe1612c0c410f549ca6d45fc52469ccd564771fcd
-  data.tar.gz: 2e87a9063cfe63fe47d58d5bf8e7b84dc88755cb39f81b88db3954a8c5a65868
+  metadata.gz: f9e4c9f26a03dde94772c0888e49e3af56d68ffc4576fff3123a8dd50a73cce7
+  data.tar.gz: d4ea926bf565928ac2873e02b08b481cf731d3d62483482de450137886505d4d
 SHA512:
-  metadata.gz: 5eec3bce25a92f77f583a258efd2f054efce9f58b4e49c72be84e3cf352da02d7a8ab984ba349014dbe0f28b45cf347d2935512e97c88c349a9507b6338ce9f1
-  data.tar.gz: 4d9778bd1883639073fe77cf36a5de42de5d14ac1acd45303e80f4c37998a3c5ec00445578df9367a298c8d2c07111b2dd41e7cd6545b4e3f05f3b95d1eb2386
+  metadata.gz: 699945070cfc1dde026841e71489a1e3d9e743cb4b49ff8e9a5f0849c1f50f3a55dab9833614377b8a998b8b181755c0efd2d090d3acd1d0f180c7dffee69c03
+  data.tar.gz: 6c1d7c1eb206352102e9d13b2f045e4e9cbd7262f8fe6baab0218ad9273e0ecab21442900730d8b1b07754b65e15d07f7341415f495930265ff892e455eb73c7

data/lib/active_record_shards/connection_switcher.rb

@@ -7,6 +7,10 @@ module ActiveRecordShards
     class LegacyConnectionHandlingError < StandardError; end
     class IsolationLevelError < StandardError; end
 
+    Thread.attr_accessor :_active_record_shards_disallow_replica_by_thread,
+                         :_active_record_shards_in_migration,
+                         :_active_record_shards_shard_selection
+
     case "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}"
     when '6.1', '7.0'
       SHARD_NAMES_CONFIG_KEY = :shard_names
@@ -20,6 +24,9 @@ module ActiveRecordShards
 
       base.singleton_class.send(:alias_method, :table_exists_without_default_shard?, :table_exists?)
       base.singleton_class.send(:alias_method, :table_exists?, :table_exists_with_default_shard?)
+
+      base.singleton_class.send(:alias_method, :reset_primary_key_without_default_shard, :reset_primary_key)
+      base.singleton_class.send(:alias_method, :reset_primary_key, :reset_primary_key_with_default_shard)
     end
 
     def on_primary_db(&block)
@@ -119,11 +126,11 @@ module ActiveRecordShards
     end
 
     def disallow_replica=(value)
-      Thread.current[:__active_record_shards__disallow_replica_by_thread] = 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
+      Thread.current._active_record_shards_disallow_replica_by_thread ||= 0
     end
 
     def supports_sharding?
@@ -135,8 +142,7 @@ module ActiveRecordShards
     end
 
     def current_shard_selection
-      cs = Thread.current.thread_variable_get(:shard_selection) || ShardSelection.new
-      Thread.current.thread_variable_set(:shard_selection, cs)
+      Thread.current._active_record_shards_shard_selection ||= ShardSelection.new
     end
 
     def current_shard_id
@@ -147,6 +153,10 @@ module ActiveRecordShards
       config_for_env[SHARD_NAMES_CONFIG_KEY] || []
     end
 
+    def reset_primary_key_with_default_shard
+      with_default_shard { reset_primary_key_without_default_shard }
+    end
+
     private
 
     def config_for_env

data/lib/active_record_shards/default_replica_patches.rb

@@ -69,7 +69,7 @@ module ActiveRecordShards
     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_migration
       return yield if _in_transaction?
 
       if on_replica_by_default?
@@ -84,7 +84,7 @@ module ActiveRecordShards
     end
 
     def force_on_replica(&block)
-      return yield if Thread.current[:_active_record_shards_in_migration]
+      return yield if Thread.current._active_record_shards_in_migration
 
       on_cx_switch_block(:replica, construct_ro_scope: false, force: true, &block)
     end
@@ -105,7 +105,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_migration
         return super if _in_transaction?
 
         if @klass.on_replica_by_default?
@@ -197,7 +197,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_migration
         return super if ActiveRecord::Base._in_transaction?
 
         if @klass.on_replica_by_default?
@@ -210,11 +210,11 @@ module ActiveRecordShards
 
     module SchemaDefinePatch
       def define(info, &block)
-        old_val = Thread.current[:_active_record_shards_in_migration]
-        Thread.current[:_active_record_shards_in_migration] = true
+        old_val = Thread.current._active_record_shards_in_migration
+        Thread.current._active_record_shards_in_migration = true
         super
       ensure
-        Thread.current[:_active_record_shards_in_migration] = old_val
+        Thread.current._active_record_shards_in_migration = old_val
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Benjamin Quorning
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-03 00:00:00.000000000 Z
+date: 2023-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord