switchman 3.5.7 → 3.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 615b594dc138a3a78ce121713f4bdd4f80c6a681d53c40d530bf41b5e3b0c131
-  data.tar.gz: 19c663ef30ce99c2ad900b170d5c0b94b1cc92d29207de7d50bb68eeaafab83c
+  metadata.gz: 88184c7066c4920ceb4b073e35742a8dd4c2b008d2e99ec58c83d17b602f94de
+  data.tar.gz: d9cc2ac7ea0f572d567c06a7afc5b21019ecb05a6bccbe111c606a19011af113
 SHA512:
-  metadata.gz: 18cc255715318ec631fd865db4eb56160cbccbcea43bae8610d9d1837d016aed4365d943025b4fbf9a42cad747b1e2a018bb2a2caf310e1cd53c97b0d2e9f8f1
-  data.tar.gz: 6d08cdb0b895d35194b10114e7ce04bdd76268a85c54a6ad1a5f5ef67cc2d9a9ebddc0c77528b255a962cdc3c25501d025de7c454c5f2d6385f5a019a210fbed
+  metadata.gz: 523170b15e3509084fcc76fcf8809883e24d4ea40f5b16f09362023c536b847af3a52fd888bb97ed983b0781d07b5e4ca3ad86ee9ee8e1b13b112bbefa4fb3b8
+  data.tar.gz: b2e6328a42baf46c0b4bbc82a0a37cc0e4dcf45d0a51323b21f8cbff005e0d7daf2c90b5a213660bc1c8296022dfcdec284473f8a48aafe8d9393641fd990e4d

data/lib/switchman/database_server.rb

@@ -268,12 +268,18 @@ module Switchman
     end
 
     def primary_shard
-      unless instance_variable_defined?(:@primary_shard)
+      return nil unless primary_shard_id
+
+      Shard.lookup(primary_shard_id)
+    end
+
+    def primary_shard_id
+      unless instance_variable_defined?(:@primary_shard_id)
         # if sharding isn't fully set up yet, we may not be able to query the shards table
-        @primary_shard = Shard.default if Shard.default.database_server == self
-        @primary_shard ||= shards.where(name: nil).first
+        @primary_shard_id = Shard.default.id if Shard.default.database_server == self
+        @primary_shard_id ||= shards.where(name: nil).first&.id
       end
-      @primary_shard
+      @primary_shard_id
     end
   end
 end

data/lib/switchman/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Switchman
-  VERSION = "3.5.7"
+  VERSION = "3.5.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.8
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord