switchman 3.0.7 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 326fba116e3a3801cdd40b47ede332a372dab86522cbeaab1a3b6b361eccce1f
-  data.tar.gz: 190457646d607aa444dbff867c67c5cd854817e8105efab44dd00fc782d1f21e
+  metadata.gz: e0148847d4a814e96ae663f5e2576e52a5feb9709a0b4ca7edf531884404e982
+  data.tar.gz: df40d39aed43999ba851a99b74808704c99f536ef352194734a66b912c260564
 SHA512:
-  metadata.gz: 3843b4407a36b8f7f3aff2381dc6ee2e5f886169349794e679759a6d13d96b52e96e832caf78728f20df7d1d017701d7e7d8847c8a4620cd6b669ba8f25e9cc6
-  data.tar.gz: 8e667cd250473f5b885fea29888454a186bafa9f694138bf0cf9f6761962ef4bf2a85b595a9cd7d26fb3f6532b4b8b8be9d6362c01329a63f94272f63ee55b4b
+  metadata.gz: 04e37250e9480e5c1d4683259c2cf5380e7da23bf44d890550920a0446a1dd3dfc1f371b294ccea6d25a3cd54b8605d8a1277613cba953e5b3d23325580d2fd2
+  data.tar.gz: c8b4d479438201645fd5fab3997258e7e7e141680d2470ed2accef6922f32b664c9349e18b72b07e9a0fcf1366b47043deaf002feeadd3517138356a213010e9

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

@@ -21,7 +21,7 @@ module Switchman
           base_db = build_db_config_from_raw_config(env_name, name, base_config)
           [base_db] + roles.map do |role|
             build_db_config_from_raw_config(env_name, "#{env_name}/#{role}",
-                                            base_config.merge(config[role]).merge(replica: true))
+                                            base_config.merge(config[role]))
           end
         end
 

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

@@ -11,22 +11,44 @@ module Switchman
     module Visitors
       module ToSql
         # rubocop:disable Naming/MethodName
+        # rubocop:disable Naming/MethodParameterName
 
-        def visit_Arel_Nodes_TableAlias(*args)
-          o, collector = args
+        def visit_Arel_Nodes_TableAlias(o, collector)
           collector = visit o.relation, collector
           collector << ' '
           collector << quote_local_table_name(o.name)
         end
 
-        def visit_Arel_Attributes_Attribute(*args)
-          o = args.first
+        def visit_Arel_Attributes_Attribute(o, collector)
           join_name = o.relation.table_alias || o.relation.name
-          result = "#{quote_local_table_name join_name}.#{quote_column_name o.name}"
-          args.last << result
+          collector << quote_local_table_name(join_name) << '.' << quote_column_name(o.name)
+        end
+
+        def visit_Arel_Nodes_HomogeneousIn(o, collector)
+          collector.preparable = false
+
+          collector << quote_local_table_name(o.table_name) << '.' << quote_column_name(o.column_name)
+
+          collector << if o.type == :in
+                         ' IN ('
+                       else
+                         ' NOT IN ('
+                       end
+
+          values = o.casted_values
+
+          if values.empty?
+            collector << @connection.quote(nil)
+          else
+            collector.add_binds(values, o.proc_for_binds, &bind_block)
+          end
+
+          collector << ')'
+          collector
         end
 
         # rubocop:enable Naming/MethodName
+        # rubocop:enable Naming/MethodParameterName
 
         def quote_local_table_name(name)
           return name if ::Arel::Nodes::SqlLiteral === name

data/lib/switchman/rails.rb

@@ -13,7 +13,7 @@ module Switchman
       end
 
       def cache
-        Switchman::Shard.current.database_server.cache_store
+        Switchman::Shard.current ? Switchman::Shard.current.database_server.cache_store : super
       end
     end
   end

data/lib/switchman/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.10
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-23 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord