switchman 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d61d2718f40a07addd2a2bbdbd6835a067800217
-  data.tar.gz: 0e8df6c7e4c19b9a1b270d0580521423e3942a27
+SHA256:
+  metadata.gz: ec38b2f9f4514dd6e8a395c91d56ec88e110df9f65901b09e9990de84d7b5144
+  data.tar.gz: 8b1941a4f918b184917a0f4293b67a0f10a3317187eb98fa6736693201801a9b
 SHA512:
-  metadata.gz: c5117529fa38094b92df0d730747b1b69f2c35fddf1295630153f96ab98969d70f1e7bf541d2261f6138a3a47751a68f56f35d1bc233ac2db7ea2f463d139de2
-  data.tar.gz: 8581bae2c4474151156155d7960c000cae51dfe54d7dde9524f944608c065e267fb7b7aa2e46ea97f279210774301d32509e101d84e0f4cbcab42a7d09a7bd96
+  metadata.gz: 54771d8a12ce199e67802b8be9c195b00ed8203a602027b6d0ab8776042341ad6ccf40f33c0cf0ac644c1339bcde9fe6668f442e0a864763f28be0ab8d5ba62d
+  data.tar.gz: 53e9832319bd99cdbe0032a6c66c0749f57e9c08e09df5bd7239b872d1a4a29b868603a43d13e7d6f23c6157a14fb7a75650b90c13b7f18e424c3e5e98ad54ac

data/lib/switchman/database_server.rb

@@ -1,3 +1,5 @@
+require "securerandom"
+
 module Switchman
   class DatabaseServer
     attr_accessor :id
@@ -136,27 +138,14 @@ module Switchman
       create_schema = options[:schema]
       # look for another shard associated with this db
       other_shard = self.shards.where("name<>':memory:' OR name IS NULL").order(:id).first
-      temp_name = other_shard&.name unless id == ::Rails.env
-      temp_name = Shard.default.name if id == ::Rails.env
 
       case config[:adapter]
         when 'postgresql'
-          temp_name ||= 'public'
           create_statement = lambda { "CREATE SCHEMA #{name}" }
           password = " PASSWORD #{::ActiveRecord::Base.connection.quote(config[:password])}" if config[:password]
         when 'sqlite3'
-          if name
-            # Try to create a db on-disk even if the only shards for sqlite are in-memory
-            temp_name = nil if temp_name == ':memory:'
-            # Put it in the db directory if there are no other sqlite shards
-            temp_name ||= 'db/dummy'
-            temp_name = File.join(File.dirname(temp_name), "#{name}.sqlite3")
-            # If they really asked for :memory:, give them :memory:
-            temp_name = name if name == ':memory:'
-            name = temp_name
-          end
+          # no create_statement
         else
-          temp_name ||= self.config[:database] % self.config
           create_statement = lambda { "CREATE DATABASE #{name}" }
       end
       sharding_config = Switchman.config
@@ -170,27 +159,35 @@ module Switchman
       end
 
       create_shard = lambda do
-        shard = Shard.create!(:name => temp_name,
-                            :database_server => self) do |shard|
-          shard.id = options[:id] if options[:id]
+        shard_id = options.fetch(:id) do
+          case config[:adapter]
+            when 'postgresql'
+              id_seq = Shard.connection.quote(Shard.connection.quote_table_name('switchman_shards_id_seq'))
+              next_id = Shard.connection.select_value("SELECT nextval(#{id_seq})")
+              next_id.to_i
+            else
+              nil
+          end
+        end
+
+        if name.nil?
+          base_name = self.config[:database].to_s % self.config
+          base_name = $1 if base_name =~ /(?:.*\/)(.+)_shard_\d+(?:\.sqlite3)?$/
+          base_name = nil if base_name == ':memory:'
+          base_name << '_' if base_name
+          base_id = shard_id || SecureRandom.uuid
+          name = "#{base_name}shard_#{base_id}"
+          if config[:adapter] == 'sqlite3'
+            name = File.join('db', "#{name}.sqlite3")
+          end
         end
+
+        shard = Shard.create!(:id => shard_id,
+                              :name => name,
+                              :database_server => self)
+
         begin
           self.class.creating_new_shard = true
-          if name.nil?
-            base_name = self.config[:database] % self.config
-            base_name = $1 if base_name =~ /(?:.*\/)(.+)_shard_\d+(?:\.sqlite3)?$/
-            base_name = nil if base_name == ':memory:'
-            base_name << '_' if base_name
-            name = "#{base_name}shard_#{shard.id}"
-            if config[:adapter] == 'sqlite3'
-              # Try to create a db on-disk even if the only shards for sqlite are in-memory
-              temp_name = nil if temp_name == ':memory:'
-              # Put it in the db directory if there are no other sqlite shards
-              temp_name ||= 'db/dummy'
-              name = File.join(File.dirname(temp_name), "#{name}.sqlite3")
-              shard.name = name
-            end
-          end
           shard.activate(*Shard.categories) do
             ::Shackles.activate(:deploy) do
               begin
@@ -199,14 +196,11 @@ module Switchman
                     ::ActiveRecord::Base.connection.execute(stmt)
                   end
                   # have to disconnect and reconnect to the correct db
-                  shard.name = name
                   if self.shareable? && other_shard
                     other_shard.activate { ::ActiveRecord::Base.connection }
                   else
                     ::ActiveRecord::Base.connection_pool.current_pool.disconnect!
                   end
-                else
-                  shard.name = name
                 end
                 old_proc = ::ActiveRecord::Base.connection.raw_connection.set_notice_processor {} if config[:adapter] == 'postgresql'
                 old_verbose = ::ActiveRecord::Migration.verbose
@@ -229,11 +223,10 @@ module Switchman
               end
             end
           end
-          shard.save!
           shard
         rescue
           shard.destroy
-          shard.drop_database if shard.name == name rescue nil
+          shard.drop_database rescue nil
           reset_column_information unless create_schema == false rescue nil
           raise
         ensure

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.10.3"
+  VERSION = "1.10.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-24 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic