switchman 1.14.5 → 1.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f75c819fb04253c0a686dbfeead8f7df63315d09a24143ede35f1bb65821296a
-  data.tar.gz: ee1ef75ff91973e810938b81e1ade42a2f9b48a3f5f8897bbefa35b85146cb12
+  metadata.gz: 533a28f86239be95ad7e7dff0a5022082f3e6373fcd4bf8b2a2aabfd69a69147
+  data.tar.gz: 8dfc6d0f03db1b578101f776c0d764c647ba5cc795525cc26f765cfb4df1e19a
 SHA512:
-  metadata.gz: 2acf90222fa2091a9311dda52ac523099ee1eaf6325058d39a7973c75654991cc925bdcc5e6983814ab6c4c33c0967b1ea0c8688da97243edc34dddf253ea92d
-  data.tar.gz: c203ee0e6b8e1d5bdb66723ece7c2abf5cf532c3c1cf2f1e7fb97dc3509a9ae4d164c147da81604d15ef4750a125449c7d693e264c207a9d017a75bb3c27021a
+  metadata.gz: 1ed1aea70b720d0f78378eaeba6eb3370e52130c7484d652d490330b2d6594d06ab77f2f15854d282000d7b337832b14adfc52d139ac8ac7e6dbf01c498aff4e
+  data.tar.gz: 9a63a6e7df75e80d82ad04ee5730c13e70409218d9aa46e04b79a0c28b05285bfa6e3114e4d39c9b53cbd4131174d9bbc87a0a02ef9fc1b1db5d3d0592d886ac

data/app/models/switchman/shard_internal.rb

@@ -179,6 +179,8 @@ module Switchman
             # still need a post-uniq, cause the default database server could be NULL or Rails.env in the db
             database_servers = scope.reorder('database_server_id').select(:database_server_id).distinct.
                 map(&:database_server).compact.uniq
+            # nothing to do
+            return if database_servers.count == 0
             parallel = [(max_procs.to_f / database_servers.count).ceil, parallel].min if max_procs
 
             scopes = Hash[database_servers.map do |server|
@@ -699,11 +701,8 @@ module Switchman
       # make sure all connection pool proxies are referencing valid pools
       ::ActiveRecord::Base.connection_handler.connection_pools.each do |pool|
         next unless pool.is_a?(ConnectionPoolProxy)
-        ::Shackles.activated_environments.each do |env|
-          ::Shackles.activate(env) do
-            pool.current_pool
-          end
-        end
+
+        pool.remove_shard!(self)
       end
     end
 

data/lib/switchman/active_record/calculations.rb

@@ -121,9 +121,8 @@ module Switchman
           group_fields = group_attrs
         end
 
-        # .clone below corrects for what I consider a Rails bug. column_alias_for modifies the string in place.
         # to_s is because Rails 5 returns a string but Rails 6 returns a symbol.
-        group_aliases = group_fields.map { |field| column_alias_for(field.clone).to_s }
+        group_aliases = group_fields.map { |field| column_alias_for(field.downcase.to_s).to_s }
         group_columns = group_aliases.zip(group_fields).map { |aliaz, field|
           [aliaz, type_for(field), column_name_for(field)]
         }

data/lib/switchman/active_record/connection_handler.rb

@@ -49,6 +49,9 @@ module Switchman
           else
             ::ActiveRecord::Base.configurations[::Rails.env] = config.stringify_keys
           end
+        else
+          # this is probably wrong now
+          Shard.default.remove_instance_variable(:@name) if Shard.default.instance_variable_defined?(:@name)
         end
 
         @shard_connection_pools ||= { [:master, Shard.default.database_server.shareable? ? ::Rails.env : Shard.default] => pool}

data/lib/switchman/active_record/connection_pool.rb

@@ -47,6 +47,20 @@ module Switchman
         end
       end
 
+      def remove_shard!(shard)
+        synchronize do
+          # The shard might be currently active, so we need to update our own shard
+          if self.shard == shard
+            self.shard = Shard.default
+          end
+          # Update out any connections that may be using this shard
+          @connections.each do |conn|
+            # This will also update the connection's shard to the default shard
+            switch_database(conn) if conn.shard == shard
+          end
+        end
+      end
+
       def clear_idle_connections!(since_when)
         synchronize do
           @connections.reject! do |conn|

data/lib/switchman/connection_pool_proxy.rb

@@ -23,7 +23,14 @@ module Switchman
       @category = category
       @default_pool = default_pool
       @connection_pools = shard_connection_pools
-      @schema_cache = SchemaCache.new(self)
+      @schema_cache = default_pool.get_schema_cache(nil) if ::Rails.version >= '6'
+      @schema_cache = SchemaCache.new(self) unless @schema_cache.is_a?(SchemaCache)
+      if ::Rails.version >= '6'
+        @default_pool.set_schema_cache(@schema_cache)
+        @connection_pools.each_value do |pool|
+          pool.set_schema_cache(@schema_cache)
+        end
+      end
     end
 
     def active_shard
@@ -50,7 +57,7 @@ module Switchman
       pool = current_pool
       begin
         connection = pool.connection
-        connection.instance_variable_set(:@schema_cache, @schema_cache)
+        connection.instance_variable_set(:@schema_cache, @schema_cache) unless ::Rails.version >= '6'
         connection
       rescue ConnectionError
         raise if active_shard.database_server == Shard.default.database_server && active_shackles_environment == :master
@@ -60,7 +67,7 @@ module Switchman
           pool = create_pool(config.dup)
           begin
             connection = pool.connection
-            connection.instance_variable_set(:@schema_cache, @schema_cache)
+            connection.instance_variable_set(:@schema_cache, @schema_cache) unless ::Rails.version >= '6'
           rescue ConnectionError
             raise if idx == configs.length - 1
             next
@@ -71,6 +78,10 @@ module Switchman
       end
     end
 
+    def get_schema_cache(_connection)
+      @schema_cache
+    end
+
     %w{release_connection
        disconnect!
        flush!
@@ -98,6 +109,10 @@ module Switchman
       connection_pools.each { |pool| pool.clear_idle_connections!(since_when) }
     end
 
+    def remove_shard!(shard)
+      connection_pools.each { |pool| pool.remove_shard!(shard) }
+    end
+
     protected
 
     def connection_pools
@@ -132,15 +147,18 @@ module Switchman
           end
         end
       end
-      args = [config, "#{config[:adapter]}_connection"]
-      args.unshift(pool_key.join("/"))
-      spec = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(*args)
+      spec = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification.new(
+        category,
+        config,
+        "#{config[:adapter]}_connection"
+      )
       # unfortunately the AR code that does this require logic can't really be
       # called in isolation
       require "active_record/connection_adapters/#{config[:adapter]}_adapter"
 
       ::ActiveRecord::ConnectionAdapters::ConnectionPool.new(spec).tap do |pool|
         pool.shard = shard
+        pool.set_schema_cache(@schema_cache) if ::Rails.version >= '6'
         if ::Rails.version >= '5.0.1'
           pool.enable_query_cache! if !@connection_pools.empty? && @connection_pools.first.last.query_cache_enabled
         end

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.14.5"
+  VERSION = "1.14.6"
 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
 
@@ -195,9 +200,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.5
+  version: 1.14.6
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-12 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties