switchman 3.5.7 → 3.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 615b594dc138a3a78ce121713f4bdd4f80c6a681d53c40d530bf41b5e3b0c131
-  data.tar.gz: 19c663ef30ce99c2ad900b170d5c0b94b1cc92d29207de7d50bb68eeaafab83c
+  metadata.gz: 64f3ba29604ff0a4f1db0b5c49000a636865f38c45ad6cb15eae252d98623d49
+  data.tar.gz: 68a22ead418800884673abd7a08ab84a38f548b065930e28258a25947ac4ab8e
 SHA512:
-  metadata.gz: 18cc255715318ec631fd865db4eb56160cbccbcea43bae8610d9d1837d016aed4365d943025b4fbf9a42cad747b1e2a018bb2a2caf310e1cd53c97b0d2e9f8f1
-  data.tar.gz: 6d08cdb0b895d35194b10114e7ce04bdd76268a85c54a6ad1a5f5ef67cc2d9a9ebddc0c77528b255a962cdc3c25501d025de7c454c5f2d6385f5a019a210fbed
+  metadata.gz: 49bf3b77179a2d5a5788cfaec67aababa9bece27589bddadc387f2eafc2651b1cd6ac6397431d5a955fad05747acd8af2fe6e1c59597a447bf91209508771138
+  data.tar.gz: ed4ae505a24d605802c67793a69d8462905ed16f638490e8fa0bdca1bb8e55f2b49f154e9c7ebd85ac6d2ba92321e7de962a559a5489e7821cc094da944d207f

data/lib/switchman/active_record/associations.rb

@@ -33,7 +33,14 @@ module Switchman
           # when called for the owner, will be returned relative to shard the query will execute on
           Shard.with_each_shard(shards,
                                 [klass.connection_class_for_self, owner.class.connection_class_for_self].uniq) do
-            super
+            if reflection.options[:multishard] && owner.respond_to?(:associated_shards) && reflection.has_scope?
+              # Prevent duplicate results when reflection has a scope (when it would use the skip_statement_cache? path)
+              # otherwise, the super call will set the shard_value to the object, causing it to iterate too many times
+              # over the associated shards
+              scope.shard(Shard.current(scope.klass.connection_class_for_self), :association).to_a
+            else
+              super
+            end
           end
         end
 

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.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.5.7
+  version: 3.5.9
 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-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord