switchman 1.14.8 → 1.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dab76e2ecd636e151a0cd1073bb2271fb54ed6051dbaecca170c89fb96de012c
-  data.tar.gz: f4537579439d2b6dc6ce8947edeaf80effb6af16eef20f13ef85b1e1803b80d9
+  metadata.gz: af371eaa6c622050b8e7db37afe53de773f420c9a4a0e17c51b2b85f6fa8a74c
+  data.tar.gz: b0002e538ef951ae7e90e1354190e6c38785844b9074254c9548579a20971f1f
 SHA512:
-  metadata.gz: a502e2f21fa54eeb1a04589ed5695b2077039ba011e2ee04fc322bfca0107ddf923b0863748c6ab08a35cc910e7f5b880d052acbddaee75149fc031e8fd0fcbd
-  data.tar.gz: 66bb964e5622bf09aecee7a9f5404056185427468634f18001d0fae2dc188d119232f15ad7d2d7b071de7e86e0a4b0a80e8394ce4eafa5b3c571821c7b42cfa1
+  metadata.gz: 335a626d0904a55dea7be067d553378c030196597cf387e3ef46037f7a26667705e2ed1b8ae54db0588ae395766d6567d9a8692ad15d16a2122e41c208adf82b
+  data.tar.gz: 9da1e76012054a5f9b9961f593cc326799740568e7135b08a3b8455ddf91a0e75c6a0a922660bc12c4f057dbc3d34a05b622737e5ac9281343cba488135eab0d

data/lib/switchman/active_record/base.rb

@@ -107,12 +107,12 @@ module Switchman
 
       def save(*args)
         @shard_set_in_stone = true
-        self.class.shard(shard, :implicit).scoping { super }
+        (self.class.current_scope || self.class.default_scoped).shard(shard, :implicit).scoping { super }
       end
 
       def save!(*args)
         @shard_set_in_stone = true
-        self.class.shard(shard, :implicit).scoping { super }
+        (self.class.current_scope || self.class.default_scoped).shard(shard, :implicit).scoping { super }
       end
 
       def destroy

data/lib/switchman/active_record/connection_handler.rb

@@ -46,8 +46,15 @@ module Switchman
 
           if ::Rails.version < '5.1'
             ::ActiveRecord::Base.configurations[::Rails.env] = spec.instance_variable_get(:@config).stringify_keys
-          else
+          elsif ::Rails.version < '6.0'
             ::ActiveRecord::Base.configurations[::Rails.env] = config.stringify_keys
+          else
+            # Adopted from the deprecated code that currently lives in rails proper
+            remaining_configs = ::ActiveRecord::Base.configurations.configurations.reject { |db_config| db_config.env_name == ::Rails.env }
+            new_config = ::ActiveRecord::DatabaseConfigurations.new(::Rails.env => config.stringify_keys).configurations
+            new_configs = remaining_configs + new_config
+
+            ::ActiveRecord::Base.configurations = new_configs
           end
         else
           # this is probably wrong now

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.14.8"
+  VERSION = "1.14.9"
 end

data/lib/tasks/switchman.rake

@@ -72,7 +72,17 @@ module Switchman
                 shard = Shard.current
                 puts "#{shard.id}: #{shard.description}"
                 ::ActiveRecord::Base.connection_pool.spec.config[:shard_name] = Shard.current.name
-                ::ActiveRecord::Base.configurations[::Rails.env] = ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys
+                if ::Rails.version < '6.0'
+                  ::ActiveRecord::Base.configurations[::Rails.env] = ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys
+                else
+                  # Adopted from the deprecated code that currently lives in rails proper
+                  remaining_configs = ::ActiveRecord::Base.configurations.configurations.reject { |db_config| db_config.env_name == ::Rails.env }
+                  new_config = ::ActiveRecord::DatabaseConfigurations.new(::Rails.env =>
+                    ::ActiveRecord::Base.connection_pool.spec.config.stringify_keys).configurations
+                  new_configs = remaining_configs + new_config
+      
+                  ::ActiveRecord::Base.configurations = new_configs
+                end
                 shard.database_server.unshackle do
                   old_actions.each { |action| action.call(*task_args) }
                 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.14.8
+  version: 1.14.9
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties