switchman 1.14.0 → 1.15.0

data/lib/switchman/r_spec_helper.rb

@@ -121,7 +121,7 @@ module Switchman
       klass.before do
         raise "Sharding did not set up correctly" if @@sharding_failed
         Shard.clear_cache
-        if ::Rails.version >= '5.1' ? use_transactional_tests : (use_transactional_tests || use_transactional_fixtures)
+        if use_transactional_tests
           Shard.default(true)
           @shard1 = Shard.find(@shard1.id)
           @shard2 = Shard.find(@shard2.id)
@@ -137,7 +137,7 @@ module Switchman
 
       klass.after do
         next if @@sharding_failed
-        if ::Rails.version >= '5.1' ? use_transactional_tests : (use_transactional_tests || use_transactional_fixtures)
+        if use_transactional_tests
           shards = [@shard2]
           shards << @shard1 unless @shard1.database_server == Shard.default.database_server
           shards.each do |shard|

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.14.0"
+  VERSION = "1.15.0"
 end

data/lib/tasks/switchman.rake

@@ -20,7 +20,12 @@ module Switchman
         open = servers.delete('open')
 
         servers = servers.map { |server| DatabaseServer.find(server) }.compact
-        servers.concat(DatabaseServer.all.select { |server| server.config[:open] }) if open
+        if open
+          open_servers = DatabaseServer.all.select { |server| server.config[:open] }
+          servers.concat(open_servers)
+          servers << DatabaseServer.find(nil) if open_servers.empty?
+          servers.uniq!
+        end
         servers = DatabaseServer.all - servers if negative
       end
 
@@ -67,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
@@ -195,9 +210,7 @@ module Switchman
       @filter_database_servers_chain ||= ->(servers) { servers }
     end
   end
-end
 
-module Switchman
   module ActiveRecord
     module PostgreSQLDatabaseTasks
       def structure_dump(filename, extra_flags=nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2020-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -48,7 +48,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.1'
@@ -173,7 +173,6 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - app/models/switchman/shard.rb
-- app/models/switchman/shard_internal.rb
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb