switchman 3.0.16 → 3.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 375c0ee6f7bf35265f46a5b5a2d5b77a60e461c84b6a7df48617e8ad6853087c
-  data.tar.gz: b64d5c4b02f258cb25e8f60ce2b328d9377ef1c744a3d488c1cae249d1a50266
+  metadata.gz: 213adc61b124f8ba48e52259c47702cb601fdc9e0ef71c452c1eeee23dc94e46
+  data.tar.gz: f7982e2e7cb3efce13291382b7fa49f9cb0da87cfd5939581368ac5735ed3e00
 SHA512:
-  metadata.gz: 286d7ed35829487f57f3e3af640861563aeea66338b78485974965b600f3cc2e3d2bd169c9a826158966466e26e8bde813067e4d904e253183b4a5dd33665e6b
-  data.tar.gz: b62ab284455df8934811480724c92ccb9ed057541e4a36026d8925725886dd1795ea2fd81c5c22a595f1cd10f3e2516468491135fd485db437f6d12c9eca76f4
+  metadata.gz: e3651c9824e8258c8854e0281ecbc081b42f3fa97524d90eb41ac701f9a5eb0bef53ea77a700c682ffa5913ea71aa7816044cfa408b051f20f4b96b86a4e5307
+  data.tar.gz: 8fac15d77c092790b6410bf15aaccef4c90243308970eddd29e2c9145281cde67e4d6572439b97966ecc2c5924557c7916aca8665e722530c2ead0d43dbcdab2

data/app/models/switchman/shard.rb

@@ -407,6 +407,7 @@ module Switchman
 
           klass.connects_to shards: connects_to_hash
         end
+        DatabaseServer.all.each { |db| db.guard! if db.config[:prefer_secondary] } unless @sharding_initialized
 
         @sharding_initialized = true
       end

data/lib/switchman/active_record/base.rb

@@ -28,19 +28,11 @@ module Switchman
           if self != ::ActiveRecord::Base && current_scope
             current_scope.activate do
               db = Shard.current(connection_classes).database_server
-              if ::GuardRail.environment == db.guard_rail_environment
-                super
-              else
-                db.unguard { super }
-              end
+              db.unguard { super }
             end
           else
             db = Shard.current(connection_classes).database_server
-            if ::GuardRail.environment == db.guard_rail_environment
-              super
-            else
-              db.unguard { super }
-            end
+            db.unguard { super }
           end
         end
 
@@ -68,6 +60,28 @@ module Switchman
           end
         end
 
+        def current_role_overriden?
+          current_role != current_role(without_overrides: true)
+        end
+
+        # significant change: Allow per-shard roles
+        def current_role(without_overrides: false)
+          return super() if without_overrides
+
+          sharded_role = nil
+          connected_to_stack.reverse_each do |hash|
+            shard_role = hash.dig(:shard_roles, current_shard)
+            if shard_role && (hash[:klasses].include?(Base) || hash[:klasses].include?(connection_classes))
+              sharded_role = shard_role
+              break
+            end
+          end
+          # Allow a shard-specific role to be reverted to regular inheritance
+          return sharded_role if sharded_role && sharded_role != :_switchman_inherit
+
+          super()
+        end
+
         # significant change: _don't_ check if klasses.include?(Base)
         # i.e. other sharded models don't inherit the current shard of Base
         def current_shard
@@ -146,7 +160,8 @@ module Switchman
 
       def with_transaction_returning_status
         shard.activate(self.class.connection_classes) do
-          super
+          db = Shard.current(self.class.connection_classes).database_server
+          db.unguard { super }
         end
       end
 
@@ -167,9 +182,7 @@ module Switchman
 
       def update_columns(*)
         db = shard.database_server
-        return db.unguard { super } if ::GuardRail.environment != db.guard_rail_environment
-
-        super
+        db.unguard { super }
       end
 
       def id_for_database

data/lib/switchman/active_record/persistence.rb

@@ -14,9 +14,7 @@ module Switchman
 
       def delete
         db = shard.database_server
-        return db.unguard { super } unless ::GuardRail.environment == db.guard_rail_environment
-
-        super
+        db.unguard { super }
       end
     end
   end

data/lib/switchman/database_server.rb

@@ -129,27 +129,26 @@ module Switchman
         end
     end
 
-    def guard_rail_environment
-      @guard_rail_environment || ::GuardRail.environment
-    end
-
     # locks this db to a specific environment, except for
     # when doing writes (then it falls back to the current
     # value of GuardRail.environment)
     def guard!(environment = :secondary)
-      @guard_rail_environment = environment
+      ::ActiveRecord::Base.connected_to_stack << { shard_roles: { id.to_sym => environment }, klasses: [::ActiveRecord::Base] }
     end
 
     def unguard!
-      @guard_rail_environment = nil
+      ::ActiveRecord::Base.connected_to_stack << { shard_roles: { id.to_sym => :_switchman_inherit }, klasses: [::ActiveRecord::Base] }
     end
 
     def unguard
-      old_env = @guard_rail_environment
-      unguard!
-      yield
-    ensure
-      guard!(old_env)
+      return yield unless ::ActiveRecord::Base.current_role_overriden?
+
+      begin
+        unguard!
+        yield
+      ensure
+        ::ActiveRecord::Base.connected_to_stack.pop
+      end
     end
 
     def shards

data/lib/switchman/guard_rail/relation.rb

@@ -6,20 +6,17 @@ module Switchman
       def exec_queries(*args)
         if lock_value
           db = Shard.current(connection_classes).database_server
-          return db.unguard { super } if ::GuardRail.environment != db.guard_rail_environment
+          db.unguard { super }
+        else
+          super
         end
-        super
       end
 
       %w[update_all delete_all].each do |method|
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           def #{method}(*args)
             db = Shard.current(connection_classes).database_server
-            if ::GuardRail.environment != db.guard_rail_environment
-              db.unguard { super }
-            else
-              super
-            end
+            db.unguard { super }
           end
         RUBY
       end

data/lib/switchman/guard_rail.rb

@@ -3,6 +3,11 @@
 module Switchman
   module GuardRail
     module ClassMethods
+      def environment
+        # no overrides so we get the global role, not the role for the default shard
+        ::ActiveRecord::Base.current_role(without_overrides: true)
+      end
+
       def activate(role)
         DatabaseServer.send(:reference_role, role)
         super

data/lib/switchman/sharded_instrumenter.rb

@@ -16,7 +16,7 @@ module Switchman
         payload[:shard] = {
           database_server_id: shard.database_server.id,
           id: shard.id,
-          env: shard.database_server.guard_rail_environment
+          env: @shard_host.pool.connection_klass&.current_role
         }
       end
       super name, payload

data/lib/switchman/version.rb

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

metadata

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