switchman 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5216239c0a0c3b84a975c7f5a7c63250a36c3960
-  data.tar.gz: 9eff38ae0cdfe742c47d25667dfa9bd5f807ad44
+  metadata.gz: fb1dad0f6da4624a6946a25d2afb9a398fa101df
+  data.tar.gz: 27c1f2e00c09a1b585408144526de94ce438561b
 SHA512:
-  metadata.gz: 1a8afa7d5bbedf8bf89d797cab7eab0285a36d01d7f1efada6fb6e7aabb459ee44abfb3f82bc9e043399cf943a95bb1bee6b2f932ea92e65b97d77d7c2510801
-  data.tar.gz: fa08be1de119479e4e9a0ad3ac6f5c6a6a18f8c3400d2d784bf30be78aaff3665875eafb2a621bd2e3a4f6181affe95a49a74b6d73e55244c0810c7409b318da
+  metadata.gz: fdf18b474711a37ade96a52015f09d736725a030151e97b0ac341741c254f1816409f36d564d19a5d4fbd29cea585d69f7c7f64c7029bd7a99cf026515fd8a07
+  data.tar.gz: 80708161aeedbb40f42ca1f837ab9333f14a7a94d1d1ca3608c28bd1cbc655cbdc5471960a437f5c82a6a3813ce23008f7034b2374c2cafc16852822b2e20cec

data/app/models/switchman/shard_internal.rb

@@ -251,7 +251,7 @@ module Switchman
 
           # only one process; don't bother forking
           if scopes.length == 1 && parallel == 1
-            return with_each_shard(subscopes.first, categories, options) { yield }
+            return with_each_shard(scopes.first.last, categories, options) { yield }
           end
 
           # clear connections prior to forking (no more queries will be executed in the parent,

data/lib/switchman/active_record/finder_methods.rb

@@ -1,9 +1,27 @@
 module Switchman
   module ActiveRecord
     module FinderMethods
-      def find_one(id)
+      def find_one(id, call_super: false)
+        return super(id) unless klass.integral_id?
+        return super(id) if call_super
+
         if shard_source_value != :implicit
-          return self.activate { super(Shard.relative_id_for(id, Shard.current(klass.shard_category), primary_shard)) }
+          current_shard = Shard.current(klass.shard_category)
+          result = self.activate do |relation, shard|
+            current_id = Shard.relative_id_for(id, current_shard, shard)
+            # current_id will be nil for non-integral id
+            next unless current_id
+            # skip the shard if the object can't be on it. unless we're only looking at one shard;
+            # we might be expecting a shadow object
+            next if current_id > Shard::IDS_PER_SHARD && self.all_shards.length > 1
+            relation.send(:find_one, current_id, call_super: true)
+          end
+          if result.is_a?(Array)
+            result = result.first
+          end
+          # we may have skipped all shards
+          raise_record_not_found_exception!(id, 0, 1) unless result
+          return result
         end
 
         local_id, shard = Shard.local_id_for(id)
@@ -22,7 +40,7 @@ module Switchman
             shard.activate { super(local_id) }
           end
         else
-          super
+          super(id)
         end
       end
 
@@ -53,7 +71,7 @@ module Switchman
 
         args = [relation, "#{name} Exists"]
         args << relation.bind_values if ::Rails.version >= '4.1'
-        activate { return true if connection.select_value(*args) }
+        relation.activate { return true if connection.select_value(*args) }
         false
       rescue
         raise if ::Rails.version >= '4.1' || !(::ActiveRecord::ThrowResult === $!)

data/lib/switchman/active_record/query_methods.rb

@@ -62,7 +62,7 @@ module Switchman
           when Hash, ::Arel::Nodes::Node
             predicates = super
             infer_shards_from_primary_key(predicates) if shard_source_value == :implicit && shard_value.is_a?(Shard)
-            predicates = transpose_predicates(predicates, nil, primary_shard) if shard_source_value != :explicit
+            predicates = transpose_predicates(predicates, nil, primary_shard)
             predicates
           else
             super
@@ -284,6 +284,8 @@ module Switchman
           current_source_shard =
               if source_shard
                 source_shard
+              elsif shard_source_value == :explicit
+                primary_shard
               elsif type == :primary
                 Shard.current(klass.shard_category)
               elsif type == :foreign

data/lib/switchman/active_record/where_clause_factory.rb

@@ -21,7 +21,7 @@ module Switchman
           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
+          predicates = @scope.transpose_predicates(predicates, nil, @scope.primary_shard, false, where_clause.binds)
           where_clause.instance_variable_set(:@predicates, predicates)
           where_clause
         else

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic