switchman 3.0.23 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdf70d4f479a11fe962b4aec7c0849f95abcb95f233ae7b5fa580608977e92b5
-  data.tar.gz: 81fe21a7875fdfbe20af3e36f778fc9a0cde2db3b595511264df87d62f5d8185
+  metadata.gz: 469ef6bca62776e9ba974a5c6d2a6220fc6ddcf1649956f43247465cbfb24f37
+  data.tar.gz: 9fefef5095835cf28a6c72197ed74f6de9974d7c9c9019ad4ea87209d98c37e9
 SHA512:
-  metadata.gz: 514d638f160d69c9df7fc272c344eb8ea0b60ef2aa4b802e05b6f0ad41cf34b71e041a838ebbc133bf4ff285a490ad2b40ec83e4417057bbb95edf1090f4fecf
-  data.tar.gz: 6ae5191dbed97e7ceb57c5bbe2704d34c576905ef0a0ec512864802146d057d3c8a4bfbd7d1ee88e882e8f9b1b8124a1edb47b04b5b335c33ae82e36a758975f
+  metadata.gz: 96d01726ff4e0e560e63964c5607417b7272202109b6e7e718769e9ba2cc04f82000f442c70aef8d6140e6dac00925197f0a95c70b790d47fbc2355d9021ae39
+  data.tar.gz: 4b2edb3c0400f3280ba579bfaac61fce263ea5dd0881e5eeb77e675e0d2c1dfe04168e059f7bb91ac601ce2ef210c50c252945258fe2166ee6cf21c458defac0

data/lib/switchman/active_record/base.rb

@@ -58,8 +58,8 @@ module Switchman
           end
         end
 
-        def current_role_overriden?
-          current_role != current_role(without_overrides: true)
+        def role_overriden?(shard_id)
+          current_role(target_shard: shard_id) != current_role(without_overrides: true)
         end
 
         def establish_connection(config_or_env = nil)
@@ -86,12 +86,12 @@ module Switchman
         end
 
         # significant change: Allow per-shard roles
-        def current_role(without_overrides: false)
+        def current_role(without_overrides: false, target_shard: current_shard)
           return super() if without_overrides
 
           sharded_role = nil
           connected_to_stack.reverse_each do |hash|
-            shard_role = hash.dig(:shard_roles, current_shard)
+            shard_role = hash.dig(:shard_roles, target_shard)
             if shard_role && (hash[:klasses].include?(::ActiveRecord::Base) || hash[:klasses].include?(connection_classes))
               sharded_role = shard_role
               break

data/lib/switchman/database_server.rb

@@ -150,7 +150,7 @@ module Switchman
     end
 
     def unguard
-      return yield unless ::ActiveRecord::Base.current_role_overriden?
+      return yield unless ::ActiveRecord::Base.role_overriden?(id.to_sym)
 
       begin
         unguard!

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = '3.0.23'
+  VERSION = '3.0.24'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.0.24
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-25 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord