switchman 1.2.18 → 1.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7c3726cb894ba0769a10192f23f39e51d67d078
-  data.tar.gz: af303da595234de7d4bc17c4ef1b7325611c16e6
+  metadata.gz: 19a3f6517d1330ac30ba3ee4cb67a853eae0329d
+  data.tar.gz: 0b0b176329a529aecf9213f1cee9ecc6bc244414
 SHA512:
-  metadata.gz: 50c4dfed21e7668d1912ea2bcea4024ec5e3e8178abd7708e0d91a8cf6d3c3646f92a7498d62bd2653a39d555a3468a1b06626e67fe30f9dc01de5eaf199f85e
-  data.tar.gz: 36e2c728ffa2ebf109aba024f3f6b0d8b3b4371a60aae9803c6b44972c6cfccd1e9c6d10c7b582f95fa61419a7054bc6113986f1ae3b490ecc053a63d582654e
+  metadata.gz: b3b5c37e80c26d5bc460028b153119f5a8f6629822e8c2f456340fa330283cfdb0c0dd30717d7859a1e2626ed07481a6529f51af480b3a3ee7c71054a5ef3a6c
+  data.tar.gz: 66bcccb82d7203664ad393886924c0e7a8f2ebb93379795292f0fd56397045129d23f10cbc3a86ac9d44b3b7f4e2aa3fdf577cf7a7322003699cb07fe1d8b88c

data/lib/switchman/active_record/spawn_methods.rb

@@ -82,6 +82,8 @@ module Switchman
         end
       else
         def merge!(r)
+          return super unless r.is_a?(::ActiveRecord::Relation)
+
           # have to figure out shard stuff *before* conditions are merged
           final_shard_value, final_primary_shard, final_shard_source_value = shard_values_for_merge(r)
 

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.2.18"
+  VERSION = "1.2.19"
 end

data/lib/tasks/switchman.rake

@@ -21,7 +21,7 @@ module Switchman
           end
           servers = servers.split(',')
           conditions = ["database_server_id #{ "NOT " if negative }IN (?)", servers]
-          conditions.first << " OR database_server_id IS NULL" if servers.include?(Rails.env) && !negative || !servers.include?(Rails.env) && negative
+          conditions.first << " OR database_server_id IS NULL" if servers.include?(::Rails.env) && !negative || !servers.include?(::Rails.env) && negative
           scope = scope.where(conditions)
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.2.18
+  version: 1.2.19
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -390,7 +390,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails 3 sharding magic
@@ -603,4 +603,3 @@ test_files:
 - spec/lib/shackles_spec.rb
 - spec/models/shard_spec.rb
 - spec/spec_helper.rb
-has_rdoc: