switchman 3.5.8 → 3.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88184c7066c4920ceb4b073e35742a8dd4c2b008d2e99ec58c83d17b602f94de
-  data.tar.gz: d9cc2ac7ea0f572d567c06a7afc5b21019ecb05a6bccbe111c606a19011af113
+  metadata.gz: a5501276e4bb51045e5d329a0cf74776a5b13318d2253d3361073f6df18c0c9b
+  data.tar.gz: 5a03efa22b8e2113f3c411b463a363f92282329e15e020a24f0b1c16a59ddcb5
 SHA512:
-  metadata.gz: 523170b15e3509084fcc76fcf8809883e24d4ea40f5b16f09362023c536b847af3a52fd888bb97ed983b0781d07b5e4ca3ad86ee9ee8e1b13b112bbefa4fb3b8
-  data.tar.gz: b2e6328a42baf46c0b4bbc82a0a37cc0e4dcf45d0a51323b21f8cbff005e0d7daf2c90b5a213660bc1c8296022dfcdec284473f8a48aafe8d9393641fd990e4d
+  metadata.gz: b1bebdf8811f527233b21c2f138682dd52f165edfc0f5929c7166df1367e273431f33777aa71b7c5768762c889208caebc7df804ff0de16f2d7e34384a951f5b
+  data.tar.gz: efd7c3efed799eb33eb0e9f1e549cd0bbbcdbc9b4713359df029bedf53c05bd2b841d557e4854e8eb19153ab42b768b2b386ce501c8174c692e10b125c28a846

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/standard_error.rb

@@ -13,8 +13,10 @@ module Switchman
         Thread.current[:switchman_error_handler] = true
 
         @active_shards ||= Shard.active_shards
-      rescue ThreadError # e.g. `require': can't be called from trap context (ThreadError)
-        # intentionally empty
+      rescue
+        # intentionally empty - don't allow calculating the active_shards to prevent
+        # creating the StandardError for any reason. this prevents various random issues
+        # when a StandardError is created within a finalizer
       ensure
         Thread.current[:switchman_error_handler] = nil
       end

data/lib/switchman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.5.8
+  version: 3.5.10
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -80,20 +80,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement