switchman 1.5.11 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6e7bdc0136ef65434df5ec4cd150a80ea3ff48a
-  data.tar.gz: 3ac58daa39eb55bc3b1ea743d6995072acf91ab2
+  metadata.gz: c25757a3ecb19cfba0a82adbe3fa0e881d58c302
+  data.tar.gz: 13b9c2b34b8f9f562b84a19bb43865436e4bdff5
 SHA512:
-  metadata.gz: 792fbbdedbdc2028003b2eda51934e9c8821d0fd479c7e5da119c453d3696f232a752bcef868c291f3cc4b31a7acf560cadfda50c4bd48df4aa64826eb27b1f3
-  data.tar.gz: 1310d057a27d42f01a7dbad5b70d6ac3be09b42aa06f3abd71f3c933260a387b3542e97a2ca5754b0bd89ee65f0689f7314f8717e5a8929c676dad24879c5ef3
+  metadata.gz: 0382c38297c9ef9cb15622fbaf342870942b660d1be4131ad085f2d891f6d38e79f5c584aba8866306f18a813703beaeafe675685f483fa75aae9de1cb1d35db
+  data.tar.gz: 03a4c27d1596eac4ced134b60abe9a2d05970a74d89c0040b8fdb3bacd4999e785c4f3d6ee14e9aa55943dfe6574d3c725b5a3b0be2c9f8d98080133de3fc2f7

data/lib/switchman/active_record/query_methods.rb

@@ -46,6 +46,19 @@ module Switchman
         # moved to WhereClauseFactory#build in Rails 5
         def build_where(opts, other = [])
           case opts
+          when String, Array
+            values = Hash === other.first ? other.first.values : other
+
+            values.grep(ActiveRecord::Relation) do |rel|
+              # serialize subqueries against the same shard as the outer query is currently
+              # targeted to run against
+              if rel.shard_source_value == :implicit && rel.primary_shard != primary_shard
+                rel.shard!(primary_shard)
+              end
+              self.bind_values += rel.bind_values if ::Rails.version < '4.2'
+            end
+
+            [@klass.send(:sanitize_sql, other.empty? ? opts : ([opts] + other))]
           when Hash, ::Arel::Nodes::Node
             predicates = super
             infer_shards_from_primary_key(predicates) if shard_source_value == :implicit && shard_value.is_a?(Shard)

data/lib/switchman/active_record/where_clause_factory.rb

@@ -5,15 +5,27 @@ module Switchman
 
       def build(opts, other = [])
         case opts
-          when Hash, ::Arel::Nodes::Node
-            where_clause = super
-            predicates = where_clause.send(:predicates)
-            @scope.send(:infer_shards_from_primary_key, predicates, where_clause.binds) if @scope.shard_source_value == :implicit && @scope.shard_value.is_a?(Shard)
-            predicates = @scope.transpose_predicates(predicates, nil, @scope.primary_shard, false, where_clause.binds) if @scope.shard_source_value != :explicit
-            where_clause.instance_variable_set(:@predicates, predicates)
-            where_clause
-          else
-            super
+        when String, Array
+          values = Hash === other.first ? other.first.values : other
+
+          values.grep(ActiveRecord::Relation) do |rel|
+            # serialize subqueries against the same shard as the outer query is currently
+            # targeted to run against
+            if rel.shard_source_value == :implicit && rel.primary_shard != @scope.primary_shard
+              rel.shard!(@scope.primary_shard)
+            end
+          end
+
+          super
+        when Hash, ::Arel::Nodes::Node
+          where_clause = super
+          predicates = where_clause.send(:predicates)
+          @scope.send(:infer_shards_from_primary_key, predicates, where_clause.binds) if @scope.shard_source_value == :implicit && @scope.shard_value.is_a?(Shard)
+          predicates = @scope.transpose_predicates(predicates, nil, @scope.primary_shard, false, where_clause.binds) if @scope.shard_source_value != :explicit
+          where_clause.instance_variable_set(:@predicates, predicates)
+          where_clause
+        else
+          super
         end
       end
     end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.5.11"
+  VERSION = "1.5.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.5.11
+  version: 1.5.13
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties