switchman 3.0.8 → 3.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e1083f3908c00847426bb780ec185b1845840da0fad4b7954fb678f904d879e
-  data.tar.gz: 0a29cd8e066d74aae0195c0ff1533e8859b01441bc788de6fda2ddb08e9d87fe
+  metadata.gz: a8f502f6ec406e1292800c9ae65cbb75e584f1059c466ec732c8aeb50379c1df
+  data.tar.gz: 823fd74a80bf27e0ddfd29d22a03f21f0b76e3d119005211414d4e998f59d5ad
 SHA512:
-  metadata.gz: 7fcd4a43310bd96e006bba2fdce3e86ec304648a4e86bcede565e136fd2fa52dd62b6aaeb6e055a8f48c9a80a1b2fe742cd6e18e91cdfbecdae1241d05b79276
-  data.tar.gz: 2f5e5dd5d949c50c8b5279efdbbc43aef2845d9be4575b2b730b437eac86e121d677a990db878940373440207b2dfeed8a9724c66366d8c353dcff2768cc5e98
+  metadata.gz: f6010a838cbb0f17f74aa12a6859d41c3a6a44c0752b130077d9c762c1c4e7d37e32f0d06fb11aa26d6727b41e41d2b1873d1ac5f5889dc77815379148e332df
+  data.tar.gz: 7479c21a001fa920c4a81a9fb797a8468dd69dca4d190e636b9ceaf159381cf122c7e10395f3ecf4902bbd435841a318636375ae72130d7dfd8f9d4632d02002

data/app/models/switchman/shard.rb

@@ -43,11 +43,9 @@ module Switchman
           @default = begin
             find_cached('default_shard') { Shard.where(default: true).take } || default
           # If we are *super* early in boot, the connection pool won't exist; we don't want to fill in the default shard yet
-          rescue ::ActiveRecord::ConnectionNotEstablished
-            nil
-          # rescue the fake default if the table doesn't exist
+          # Otherwise, rescue the fake default if the table doesn't exist
           rescue
-            default
+            sharding_initialized ? default : nil
           end
           return default unless @default
 
@@ -469,6 +467,10 @@ module Switchman
 
       private
 
+      def sharding_initialized
+        @sharding_initialized ||= false
+      end
+
       def add_sharded_model(klass)
         @sharded_models = (sharded_models + [klass]).freeze
         initialize_sharding
@@ -496,6 +498,8 @@ module Switchman
 
           klass.connects_to shards: connects_to_hash
         end
+
+        @sharding_initialized = true
       end
 
       # in-process caching

data/lib/switchman/active_record/query_methods.rb

@@ -270,11 +270,11 @@ module Switchman
           right_node = or_expr.right
           new_left_predicates = transpose_single_predicate(left_node, source_shard,
                                                            target_shard, remove_nonlocal_primary_keys: remove_nonlocal_primary_keys)
-          or_expr.instance_variable_set(:@left, new_left_predicates) if new_left_predicates != left_node
           new_right_predicates = transpose_single_predicate(right_node, source_shard,
                                                             target_shard, remove_nonlocal_primary_keys: remove_nonlocal_primary_keys)
-          or_expr.instance_variable_set(:@right, new_right_predicates) if new_right_predicates != right_node
-          return predicate
+          return predicate if new_left_predicates == left_node && new_right_predicates == right_node
+
+          return ::Arel::Nodes::Grouping.new ::Arel::Nodes::Or.new(new_left_predicates, new_right_predicates)
         end
         return predicate unless predicate.is_a?(::Arel::Nodes::Binary) || predicate.is_a?(::Arel::Nodes::HomogeneousIn)
         return predicate unless predicate.left.is_a?(::Arel::Attributes::Attribute)

data/lib/switchman/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 3.0.9
 platform: ruby
 authors:
 - Cody Cutrer
 - James Williams
 - Jacob Fugal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -300,7 +300,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.4
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Rails sharding magic
 test_files: []