switchman 2.2.0 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd39304f0dfae8329f95979c1cb2075d09a73cace1b2befa5f62c3100e863ca2
-  data.tar.gz: 742dd9cdbd63e3124b9ae4a9e0d73b56a071c43011f3ec0cdf43681f4977c116
+  metadata.gz: c6658f02bb242697d5c6b9d7e9c57ba3613295fddc1de3d618cb74ed125835aa
+  data.tar.gz: 05fa7e267a2d442d3f9862e041fe6f297e3272693dd15273bfb17ec86187450f
 SHA512:
-  metadata.gz: 5355bcac300f60b1c2d626998ebd97a52871c4beff4bc597d2acc1f0439b7365b1a7478f91ec5a05bd8faa2df545e5444341ac296c826f1ab701372180a0282c
-  data.tar.gz: 54a69a012b6d48b91efd5417a71a536a9da8b02283284c5e9327121dcce0c458a1f065d6357012b9cbeba1dbba0603357a64505e69a16de886b9d34add5d8976
+  metadata.gz: 3651b8ad5d882571716507a49e264b90d70a318e436e816e9dbe2ec0b9ff70031f4bfa7fce4e04748bad8e4dad88a36d16eac4afa1b0c61e2f686ed138bb2ef5
+  data.tar.gz: d1d98111fc70a2786768b61856ae4a54ba914275628489d99f12b7de7b0a891d62e7c41189aad2a388941a0c9ce89742d6751c4078ff15b57660d63d390978ce

data/lib/switchman/active_record/attribute_methods.rb

@@ -90,7 +90,7 @@ module Switchman
         def define_method_original_attribute(attr_name)
           if sharded_column?(attr_name)
             reflection = reflection_for_integer_attribute(attr_name)
-            if attr_name == "id" && ::Rails.version >= '5.1.2'
+            if attr_name == "id"
               return if self.method_defined?(:original_id)
               owner = self
             else

data/lib/switchman/active_record/connection_pool.rb

@@ -75,7 +75,9 @@ module Switchman
           end
           @available.clear
           @connections.each do |conn|
-            @available.add conn
+            # we do not want to be introducing leased
+            # connections into the available queue
+            @available.add(conn) unless conn.in_use?
           end
         end
       end

data/lib/switchman/active_record/log_subscriber.rb

@@ -20,10 +20,7 @@ module Switchman
         shard = "  [#{shard[:database_server_id]}:#{shard[:id]} #{shard[:env]}]" if shard
 
         unless (payload[:binds] || []).empty?
-          use_old_format = (::Rails.version < '5.1.5')
-          args = use_old_format ?
-            [payload[:binds], payload[:type_casted_binds]] :
-            [payload[:type_casted_binds]]
+          args = [payload[:type_casted_binds]]
           casted_params = type_casted_binds(*args)
           binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|
             render_bind(attr, value)

data/lib/switchman/active_record/query_cache.rb

@@ -19,7 +19,7 @@ module Switchman
                   connection_id: object_id,
                   cached: true
                 }
-                args[:type_casted_binds] = -> { type_casted_binds(binds) } if ::Rails.version >= '5.1.5'
+                args[:type_casted_binds] = -> { type_casted_binds(binds) }
                 ::ActiveSupport::Notifications.instrument(
                     "sql.active_record",
                     args

data/lib/switchman/active_record/query_methods.rb

@@ -78,6 +78,10 @@ module Switchman
         end
       end
 
+      def or(other)
+        super(other.shard(self.primary_shard))
+      end
+
       private
 
       if ::Rails.version >= '5.2'
@@ -258,6 +262,25 @@ module Switchman
             end)
           end
 
+          if predicate.is_a?(::Arel::Nodes::Grouping)
+            next predicate unless predicate.expr.is_a?(::Arel::Nodes::Or)
+
+            or_expr = predicate.expr
+            left_node = or_expr.left
+            right_node = or_expr.right
+            new_left_predicates, binds = transpose_predicates([left_node], source_shard, target_shard,
+              remove_nonlocal_primary_keys,
+              binds: binds,
+              dup_binds_on_mutation: dup_binds_on_mutation)
+            new_right_predicates, binds = transpose_predicates([right_node], source_shard, target_shard,
+              remove_nonlocal_primary_keys,
+              binds: binds,
+              dup_binds_on_mutation: dup_binds_on_mutation)
+
+            next predicate if new_left_predicates[0] == left_node && new_right_predicates[0] == right_node
+            next ::Arel::Nodes::Grouping.new ::Arel::Nodes::Or.new(new_left_predicates[0], new_right_predicates[0])
+          end
+
           next predicate unless predicate.is_a?(::Arel::Nodes::Binary)
           next predicate unless predicate.left.is_a?(::Arel::Attributes::Attribute)
           relation, column = relation_and_column(predicate.left)

data/lib/switchman/version.rb

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

data/lib/tasks/switchman.rake

@@ -47,7 +47,7 @@ module Switchman
 
     def self.options
       # we still pass through both of these options for back-compat purposes
-      { parallel: ENV['PARALLEL'].to_i, max_procs: ENV['MAX_PARALLEL_PROCS'] }
+      { parallel: ENV['PARALLEL']&.to_i, max_procs: ENV['MAX_PARALLEL_PROCS']&.to_i }
     end
 
     # categories - an array or proc, to activate as the current shard during the
@@ -90,7 +90,7 @@ module Switchman
                 nil
               end
             rescue => e
-              puts "Exception from #{e.current_shard.id}: #{e.current_shard.description}" if options[:parallel] != 0
+              puts "Exception from #{e.current_shard.id}: #{e.current_shard.description}" if options[:parallel].to_i != 0
               raise
             end
           end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Cody Cutrer
 - James Williams
 - Jacob Fugal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -257,7 +257,7 @@ homepage: http://www.instructure.com/
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -265,15 +265,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.24
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Rails sharding magic
 test_files: []