switchman 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 901b8608f750cdaacfabbb90b2894acb1e73adeb27438ccff1907376f41bbadd
-  data.tar.gz: 5dc547e878ef50027f013370010372dcb90fdda3ada531b5d6dc85cb902db633
+  metadata.gz: c6658f02bb242697d5c6b9d7e9c57ba3613295fddc1de3d618cb74ed125835aa
+  data.tar.gz: 05fa7e267a2d442d3f9862e041fe6f297e3272693dd15273bfb17ec86187450f
 SHA512:
-  metadata.gz: 5b16b9e6ea387ec65f117e29d9b12b02287b4403474342b593fcefed333cc816137a596af01fa63eb78e5f37a44381177071e95453c8ea2d0bbb0366a3ce8992
-  data.tar.gz: af01a3a853f9c54151da689ba408e8443ee40ba97402175ae0e0cdf961af6f6c9396c57dee668d2a2c885ad22d313fbe4de9804a063317628500ff1636487ef7
+  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/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.2"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-19 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'
@@ -265,14 +265,14 @@ 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.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Rails sharding magic