switchman 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cc38b30914de73cddc2b347abe5e0fdfd1e35f
-  data.tar.gz: d12887e2755b199c584906a13f51df762ed602d0
+  metadata.gz: b8f3e448e1f627fcd836971b4e1e866e43082987
+  data.tar.gz: 204b5b664a1349b4e74652e18fbc66281d240f6f
 SHA512:
-  metadata.gz: 58f34befaed170ea8a74df108d28bc925edeafe994dbec25d26a93d44ec73f5b5824a8c9ba111963ee7c6d8cfa10051d434d05ff51bb1b517b87ef641f8e844b
-  data.tar.gz: 7ab150743f0ecc027b4935dc5e2630f2c242a53d191439789399a13433fda2d20f76f3b050f57882a3e57cb241c71659eec8ac3233423085a4b3da636214fffb
+  metadata.gz: 2ed76354d01310128a8a0003611810091bfa79b6148f2e7d58e3adef4d810fef6bbe4dc2f819cf2cfe61ac1ea91d86195e30a7da2490b8293afe406356eeaab5
+  data.tar.gz: 0f78ee14df104f97acdf4dd01dea9d823f40c6b606d916d893c0273bfec6fd1b76d97014267163f1ec748f33e7e1f1fe522b1148f45d4a4e5df5cda88bbbdddd

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -205,6 +205,12 @@ module Switchman
           ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(table_name, to_table, options)
         end
       end
+
+      def add_index_options(_table_name, _column_name, _options = {})
+        index_name, index_type, index_columns, index_options, algorithm, using = super
+        algorithm = nil if DatabaseServer.creating_new_shard && algorithm == "CONCURRENTLY"
+        [index_name, index_type, index_columns, index_options, algorithm, using]
+      end
     end
   end
 end

data/lib/switchman/database_server.rb

@@ -3,6 +3,8 @@ module Switchman
     attr_accessor :id
 
     class << self
+      attr_accessor :creating_new_shard
+
       def all
         database_servers.values
       end
@@ -173,6 +175,7 @@ module Switchman
           shard.id = options[:id] if options[:id]
         end
         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)?$/
@@ -233,6 +236,8 @@ module Switchman
           shard.drop_database if shard.name == name rescue nil
           reset_column_information unless create_schema == false rescue nil
           raise
+        ensure
+          self.class.creating_new_shard = false
         end
       end
 

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.5"
+  VERSION = "1.9.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties