switchman 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbaba3af0fb2692fd3e75ec8ca0d76c2dfcc187
-  data.tar.gz: 1a6fd4d0e9b20174505d6421e819f46ab47e60aa
+  metadata.gz: d7f51b0f73ecf8a120874ea26b445667fec18f05
+  data.tar.gz: b5a6230b66f1ada9c4e43723455e3a2e89d1b890
 SHA512:
-  metadata.gz: 2f7720c65be9c6dd30af6b8a21e6dad2b9ba6028d2ab743cd03a941cae96fb69c245b3935adc48e725e3361458052f2e28f2ac6bbc4c92a0641241c24b5a5ff5
-  data.tar.gz: a9f90607b3362d9f32530e99b17bded68cda2a5f4733c79916e0c1b0fa84a4f33ded8c43c3c9afefcb457e5a5fc4bb2a7e97e5b4e3b30e9d17ba81603050a7a5
+  metadata.gz: fe5d162dd3898d974f646821b20530657e98ff432c31900a924668852df2ab745c2bf9b9dee8f43dab50d02b0085f320c9b5e64804ba4c87166c94f15f4be47a
+  data.tar.gz: ac04c1e4f2908c1361e95f1d13a6fccf014c2f0a15b4ff2277a0a0e60afa8d53041e96204b0f1e71331ab8187eaec81fb909d286c3ccb78938e2a60902d820e4

data/app/models/switchman/shard_internal.rb

@@ -185,7 +185,7 @@ module Switchman
 
         scope ||= Shard.all
         if ::ActiveRecord::Relation === scope && scope.order_values.empty?
-          scope = scope.order("database_server_id IS NOT NULL, database_server_id, id")
+          scope = scope.order(::Arel.sql("database_server_id IS NOT NULL, database_server_id, id"))
         end
 
         if parallel > 0

data/lib/switchman/active_record/batches.rb

@@ -2,7 +2,7 @@ module Switchman
   module ActiveRecord
     module Batches
       def batch_order
-        "#{connection.quote_local_table_name(table_name)}.#{quoted_primary_key} ASC"
+        ::Arel.sql("#{connection.quote_local_table_name(table_name)}.#{quoted_primary_key} ASC")
       end
     end
   end

data/lib/switchman/active_record/persistence.rb

@@ -5,6 +5,12 @@ module Switchman
       def touch(*)
         shard.activate(self.class.shard_category) { super }
       end
+
+      if ::Rails.version >= '5.2'
+        def update_columns(*)
+          shard.activate(self.class.shard_category) { super }
+        end
+      end
     end
   end
 end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

data/lib/tasks/switchman.rake

@@ -26,7 +26,7 @@ module Switchman
 
       servers = filter_database_servers_chain.call(servers)
 
-      scope = base_scope.order("database_server_id IS NOT NULL, database_server_id, id")
+      scope = base_scope.order(::Arel.sql("database_server_id IS NOT NULL, database_server_id, id"))
       if servers != DatabaseServer.all
         conditions = ["database_server_id IN (?)", servers.map(&:id)]
         conditions.first << " OR database_server_id IS NULL" if servers.include?(Shard.default.database_server)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties