switchman 1.12.2 → 1.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30c5f9189d259f408422987d4b1541fbe4102ff
-  data.tar.gz: d3e6037589283e074d1574daf373cedf4527c654
+  metadata.gz: 1ede324b26c105f71f0d071eee8afa73297430ae
+  data.tar.gz: 6dc4b1fd3878baa64ab87827cdab9da20c7693fd
 SHA512:
-  metadata.gz: 44d60d03f4fffc373cb5d0d431e5499abbd63d5e84d1045e524a2c6d451196ae6d414bc549e150ee790af5986a76f14be24c7c6ef01bcd3700eab1b18486f420
-  data.tar.gz: d0e16a2da2cd08f015ea7cb1d65203885597b5e19c149a2f0c7db5c6634873e1500f1062a16ffafdcb8fffaf184f13b692ba79eeedc2b9c2dadf2bf9d549bb2d
+  metadata.gz: 8655c6d6342901d739e858f5914aafc2a5b3a875c30a58802128df70630abcb2f09de364a52e43064ad5388368845d8d28c944617a7fd36eaaae7db45cf2e2ae
+  data.tar.gz: 5631ec070476582189e1ebb53c1822d50c2c72a5ee0dab301d604a18166f166e143e1b13edfee3fc95df015bf5a2e315e4ebc067d77dd6e8e741ffbd1936290a

data/lib/switchman/active_record/query_methods.rb

@@ -224,7 +224,7 @@ module Switchman
       end
 
       def arel_columns(columns)
-        columns.map do |field|
+        columns.flat_map do |field|
           if (Symbol === field || String === field) && (klass.has_attribute?(field) || klass.attribute_alias?(field)) && !from_clause.value
             klass.arel_attribute(field, table)
           elsif (Symbol === field || String === field) && columns_hash.key?(field.to_s) && !from_value
@@ -233,6 +233,8 @@ module Switchman
             # the rest of this is pulled from AR - the only change is from quote_table_name to quote_column_name here
             # otherwise qualified names will add the schema to a column
             connection.quote_column_name(field.to_s)
+          elsif Proc === field
+            field.call
           else
             field
           end
@@ -316,7 +318,7 @@ module Switchman
               predicate.right
             else
               local_id = Shard.relative_id_for(predicate.right, current_source_shard, target_shard) || predicate.right
-              local_id = [] if remove && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+              local_id = [] if remove && local_id.is_a?(Integer) && local_id > Shard::IDS_PER_SHARD
               local_id
             end
           end
@@ -346,7 +348,7 @@ module Switchman
             value
           else
             local_id = Shard.relative_id_for(current_id, current_shard, target_shard) || current_id
-            local_id = [] if remove_non_local_ids && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+            local_id = [] if remove_non_local_ids && local_id.is_a?(Integer) && local_id > Shard::IDS_PER_SHARD
             if current_id != local_id
               # make a new bind param
               ::Arel::Nodes::BindParam.new(query_att.class.new(query_att.name, local_id, query_att.type))
@@ -356,7 +358,7 @@ module Switchman
           end
         else
           local_id = Shard.relative_id_for(value, current_shard, target_shard) || value
-          local_id = [] if remove_non_local_ids && local_id.is_a?(Fixnum) && local_id > Shard::IDS_PER_SHARD
+          local_id = [] if remove_non_local_ids && local_id.is_a?(Integer) && local_id > Shard::IDS_PER_SHARD
           local_id
         end
       end

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
@@ -232,11 +226,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.12.2"
+  VERSION = "1.12.3"
 end

metadata

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