switchman 1.4.2 → 1.4.3

data/spec/dummy/tmp/cache/377/540/shard%2F2221

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454952281.847283:@expires_in0

data/spec/dummy/tmp/cache/379/540/shard%2F3015

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954252.107578:@expires_in0

data/spec/dummy/tmp/cache/379/580/shard%2F2403

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953751.124701:@expires_in0

data/spec/dummy/tmp/cache/37A/5E0/shard%2F2611

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953911.634756:@expires_in0

data/spec/dummy/tmp/cache/37B/5A0/shard%2F2324

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953567.7266428:@expires_in0

data/spec/dummy/tmp/cache/37C/5D0/shard%2F2343

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi'	I"	name;TI"switchman_test_shard_2343;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454953700.1946151:@expires_in0

data/spec/dummy/tmp/cache/37C/5E0/shard%2F2352

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953697.943316:@expires_in0

data/spec/dummy/tmp/cache/37D/5E0/shard%2F2344

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi(	I"	name;TI"switchman_test_shard_2344;TI"database_server_id;TI"1;TI"default;TF:@created_atf1454953700.1967208:@expires_in0

data/spec/dummy/tmp/cache/37D/650/shard%2F2812

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954185.702271:@expires_in0

data/spec/dummy/tmp/cache/37D/660/shard%2F2740

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2740;TI"database_server_id;TI"1;TI"default;TF:@created_atf1454954139.659113:@expires_in0

data/spec/dummy/tmp/cache/37E/640/shard%2F2390

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953718.354923:@expires_in0

data/spec/dummy/tmp/cache/37F/660/shard%2F2562

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953894.35137:@expires_in0

data/spec/dummy/tmp/cache/37F/680/shard%2F2823

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETiI"	name;TI"switchman_test_shard_2823;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454954195.612056:@expires_in0

data/spec/dummy/tmp/cache/37F/6B0/shard%2F2931

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954223.821203:@expires_in0

data/spec/dummy/tmp/cache/380/630/shard%2F2527

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953883.913304:@expires_in0

data/spec/dummy/tmp/cache/380/670/shard%2F2644

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953923.02127:@expires_in0

data/spec/dummy/tmp/cache/380/690/shard%2F2824

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETiI"	name;TI"switchman_test_shard_2824;TI"database_server_id;TI"1;TI"default;TF:@created_atf1454954195.6708689:@expires_in0

data/spec/dummy/tmp/cache/380/6E0/shard%2F2950

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954231.403268:@expires_in0

data/spec/dummy/tmp/cache/382/640/shard%2F2277

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953221.727403:@expires_in0

data/spec/dummy/tmp/cache/382/650/shard%2F2448

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953852.345695:@expires_in0

data/spec/dummy/tmp/cache/382/660/shard%2F2295

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953421.8768268:@expires_in0

data/spec/dummy/tmp/cache/382/6F0/shard%2F2781

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954174.635145:@expires_in0

data/spec/dummy/tmp/cache/382/700/shard%2F2871

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954203.967125:@expires_in0

data/spec/dummy/tmp/cache/383/6B0/shard%2F2494

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953875.538141:@expires_in0

data/spec/dummy/tmp/cache/383/6B0/shard%2F2575

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi
+I"	name;TI"switchman_test_shard_2575;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454953905.079722:@expires_in0

data/spec/dummy/tmp/cache/383/6F0/shard%2F2935

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETiwI"	name;TI"switchman_test_shard_2935;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454954233.520403:@expires_in0

data/spec/dummy/tmp/cache/384/700/shard%2F2693

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953942.2424982:@expires_in0

data/spec/dummy/tmp/cache/384/700/shard%2F2936

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETixI"	name;TI"switchman_test_shard_2936;TI"database_server_id;TI"1;TI"default;TF:@created_atf1454954233.5221171:@expires_in0

data/spec/dummy/tmp/cache/385/6D0/shard%2F2739

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2739;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454954139.6567528:@expires_in0

data/spec/dummy/tmp/cache/385/6E0/shard%2F2586

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953902.985973:@expires_in0

data/spec/dummy/tmp/cache/385/760/shard%2F2982

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954241.1974971:@expires_in0

data/spec/dummy/tmp/cache/386/6C0/shard%2F2479

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953865.986658:@expires_in0

data/spec/dummy/tmp/cache/386/710/shard%2F2767

@@ -0,0 +1,2 @@
+o: ActiveSupport::Cache::Entry:@value{	I"id:ETi�
+I"	name;TI"switchman_test_shard_2767;TI"database_server_id;TI"	test;TI"default;TF:@created_atf1454954177.128216:@expires_in0

data/spec/dummy/tmp/cache/386/710/shard%2F2848

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954194.7953842:@expires_in0

data/spec/dummy/tmp/cache/387/700/shard%2F2669

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953931.866626:@expires_in0

data/spec/dummy/tmp/cache/387/710/shard%2F2759

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954138.313615:@expires_in0

data/spec/dummy/tmp/cache/388/770/shard%2F2886

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954212.902188:@expires_in0

data/spec/dummy/tmp/cache/3A4/F20/shard%2F13000

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954252.136723:@expires_in0

data/spec/dummy/tmp/cache/3A6/F50/shard%2F12201

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454952281.399483:@expires_in0

data/spec/dummy/tmp/cache/3A7/FA0/shard%2F12400

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953750.627025:@expires_in0

data/spec/dummy/tmp/cache/3AA/FC0/shard%2F12313

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953567.388341:@expires_in0

data/spec/dummy/tmp/cache/3AB/010/shard%2F12512

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953883.9622452:@expires_in0

data/spec/dummy/tmp/cache/3AD/010/shard%2F12253

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953221.654282:@expires_in0

data/spec/dummy/tmp/cache/3AE/030/shard%2F12344

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953697.991678:@expires_in0

data/spec/dummy/tmp/cache/3AE/0B0/shard%2F12740

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954138.386438:@expires_in0

data/spec/dummy/tmp/cache/3AF/070/shard%2F12372

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953718.218687:@expires_in0

data/spec/dummy/tmp/cache/3AF/080/shard%2F12624

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953923.291151:@expires_in0

data/spec/dummy/tmp/cache/3B0/060/shard%2F12436

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953852.630045:@expires_in0

data/spec/dummy/tmp/cache/3B0/0C0/shard%2F12652

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953931.9088142:@expires_in0

data/spec/dummy/tmp/cache/3B1/090/shard%2F12293

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953421.781354:@expires_in0

data/spec/dummy/tmp/cache/3B1/0E0/shard%2F12824

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954194.927814:@expires_in0

data/spec/dummy/tmp/cache/3B1/100/shard%2F12680

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953942.115639:@expires_in0

data/spec/dummy/tmp/cache/3B2/0A0/shard%2F12456

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953865.844864:@expires_in0

data/spec/dummy/tmp/cache/3B2/120/shard%2F12852

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954203.671841:@expires_in0

data/spec/dummy/tmp/cache/3B3/0E0/shard%2F12484

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953875.5033212:@expires_in0

data/spec/dummy/tmp/cache/3B3/160/shard%2F12880

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954212.824377:@expires_in0

data/spec/dummy/tmp/cache/3B4/0D0/shard%2F12548

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953894.449315:@expires_in0

data/spec/dummy/tmp/cache/3B4/110/shard%2F12908

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954223.9249978:@expires_in0

data/spec/dummy/tmp/cache/3B5/110/shard%2F12576

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953902.886399:@expires_in0

data/spec/dummy/tmp/cache/3B5/150/shard%2F12936

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954230.9272928:@expires_in0

data/spec/dummy/tmp/cache/3B6/190/shard%2F12964

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954240.867776:@expires_in0

data/spec/dummy/tmp/cache/3B7/150/shard%2F12596

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454953911.156364:@expires_in0

data/spec/dummy/tmp/cache/3B8/170/shard%2F12768

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954174.670942:@expires_in0

data/spec/dummy/tmp/cache/3B9/1B0/shard%2F12796

@@ -0,0 +1 @@
+o: ActiveSupport::Cache::Entry:@value:nil:@created_atf1454954185.3990772:@expires_in0

data/spec/lib/active_record/connection_pool_spec.rb

@@ -6,23 +6,23 @@ module Switchman
       it "should be able to access another shard on a db server after the 'primary' shard is gone" do
         skip 'A "real" database"' unless Shard.default.database_server.shareable?
         # separate connections
-        server = DatabaseServer.create(:config => Shard.default.database_server.config.dup)
+        server = DatabaseServer.create(Shard.default.database_server.config)
         s1 = server.shards.create!(:name => 'non_existent_shard') # don't actually create any schema
         s2 = server.shards.create! # inherit's the default shard's config, which is functional
         s1.activate do
-          expect { User.count }.to raise_exception
+          expect { User.count }.to raise_error(::ActiveRecord::StatementInvalid)
         end
         # the config for s1 should not be the permanent default for all new
         # connections now
         s2.activate do
-          expect { User.count }.not_to raise_exception
+          expect { User.count }.not_to raise_error
         end
       end
 
       describe "clear_idle_connections!" do
         before do
           skip 'A "real" database"' unless Shard.default.database_server.shareable?
-          @server = DatabaseServer.create(:config => Shard.default.database_server.config.dup)
+          @server = DatabaseServer.create(Shard.default.database_server.config)
           @shard = @server.shards.create!
           @conn, @pool = @shard.activate{ [User.connection, User.connection_pool.current_pool] }
         end
@@ -56,7 +56,7 @@ module Switchman
       describe "release_connection" do
         before do
           skip 'A "real" database"' unless Shard.default.database_server.shareable?
-          @server = DatabaseServer.create(:config => Shard.default.database_server.config.dup)
+          @server = DatabaseServer.create(Shard.default.database_server.config)
           @shard = @server.shards.create!
           @pool = @shard.activate{ User.connection_pool.current_pool }
           @timeout_was = @pool.spec.config[:idle_timeout]

data/spec/lib/active_record/postgresql_adapter_spec.rb

@@ -30,6 +30,7 @@ module Switchman
           shard.stubs(:name).returns('bob')
           ::ActiveRecord::Base.connection.stubs(:use_qualified_names?).returns(true)
           ::ActiveRecord::Base.connection.stubs(:shard).returns(shard)
+          ::ActiveRecord::Base.connection.stubs(:columns).returns([])
 
           expect(User.joins(:parent).where(id: 1).to_sql).to be_include %{* FROM "bob"."users" INNER JOIN "bob"."users" "parents_users" ON "parents_users"."id" = "users"."parent_id" WHERE "users"."id" = 1}
         end

data/spec/lib/connection_pool_proxy_spec.rb

@@ -5,7 +5,7 @@ module Switchman
     include RSpecHelper
 
     it "should not share connections for sqlite shards on the same db" do
-      @db = DatabaseServer.create(:config => { :adapter => 'sqlite3', :database => ':memory:' })
+      @db = DatabaseServer.create(adapter: 'sqlite3', database: ':memory:')
       @sqlite_shard1 = @db.shards.create!
       @sqlite_shard2 = @db.shards.create!
       expect(::ActiveRecord::Base.connection).not_to eq @sqlite_shard2.activate { ::ActiveRecord::Base.connection }

data/spec/lib/database_server_spec.rb

@@ -4,36 +4,36 @@ module Switchman
   describe DatabaseServer do
     describe "shareable?" do
       it "should be false for sqlite" do
-        db = DatabaseServer.new(config: { adapter: 'sqlite3', database: '%{shard_name}' })
+        db = DatabaseServer.new(nil, adapter: 'sqlite3', database: '%{shard_name}')
         expect(db.shareable?).to eq false
       end
 
       it "should be true for mysql" do
-        db = DatabaseServer.new(config: { adapter: 'mysql' })
+        db = DatabaseServer.new(nil, adapter: 'mysql')
         expect(db.shareable?).to eq true
 
-        db = DatabaseServer.new(config: { adapter: 'mysql2' })
+        db = DatabaseServer.new(nil, adapter: 'mysql2')
         expect(db.shareable?).to eq true
       end
 
       it "should be true for postgres with a non-variable username" do
-        db = DatabaseServer.new(config: { adapter: 'postgresql' })
+        db = DatabaseServer.new(nil, adapter: 'postgresql')
         expect(db.shareable?).to eq true
       end
 
       it "should be false for postgres with variable username" do
-        db = DatabaseServer.new(config: { adapter: 'postgresql', username: '%{schema_search_path}' })
+        db = DatabaseServer.new(nil, adapter: 'postgresql', username: '%{schema_search_path}')
         expect(db.shareable?).to eq false
       end
 
       it "should depend on the database environment" do
-        db = DatabaseServer.new(config: { adapter: 'postgresql', username: '%{schema_search_path}', deploy: { username: 'deploy' }})
+        db = DatabaseServer.new(nil, adapter: 'postgresql', username: '%{schema_search_path}', deploy: { username: 'deploy' })
         expect(db.shareable?).to eq false
         expect(::Shackles.activate(:deploy) { db.shareable? }).to eq true
       end
 
       it "should handle string keys" do
-        db = DatabaseServer.new(config: { adapter: 'postgresql', username: '%{schema_search_path}', deploy: { 'username' => 'deploy' }})
+        db = DatabaseServer.new(nil, adapter: 'postgresql', username: '%{schema_search_path}', deploy: { 'username' => 'deploy' })
         expect(db.shareable?).to eq false
         expect(::Shackles.activate(:deploy) { db.shareable? }).to eq true
       end
@@ -72,7 +72,7 @@ module Switchman
       end
 
       it "should be able to create a new sqlite shard from a given server" do
-        db = DatabaseServer.create(:config => { :adapter => 'sqlite3', :database => '%{shard_name}', :shard_name => ':memory:' })
+        db = DatabaseServer.create(adapter: 'sqlite3', database: '%{shard_name}', shard_name: ':memory:')
         begin
           create_shard(db)
         ensure
@@ -93,7 +93,7 @@ module Switchman
         skip 'A "real" database"' unless %w{MySQL Mysql2 PostgreSQL}.include?(adapter)
 
         # So, it's really the same server, but we want separate connections
-        db = DatabaseServer.create(:config => Shard.default.database_server.config)
+        db = DatabaseServer.create(Shard.default.database_server.config)
         begin
           create_shard(db)
         ensure
@@ -103,7 +103,7 @@ module Switchman
 
       class MyException < Exception; end
       it "should use the connection's db name as temp db name" do
-        db = DatabaseServer.new(config: { adapter: 'postgresql' })
+        db = DatabaseServer.new(nil, adapter: 'postgresql')
         Shard.expects(:create!).with(:name => Shard.default.name, :database_server => db).raises(MyException.new)
         expect { db.create_new_shard }.to raise_error(MyException)
       end
@@ -114,7 +114,7 @@ module Switchman
         base_config = { database: 'db',
                         slave: [nil, { database: 'slave' }],
                         deploy: { username: 'deploy' }}
-        ds = DatabaseServer.new(config: base_config)
+        ds = DatabaseServer.new(nil, base_config)
         expect(ds.config).to eq base_config
         expect(ds.config(:slave)).to eq [{ database: 'db', deploy: base_config[:deploy] },
                                      { database: 'slave', deploy: base_config[:deploy] }]
@@ -195,7 +195,7 @@ module Switchman
       after(:all) do
         @db1.config[:open] = @old_open
         @old_servers.each do |db|
-          DatabaseServer.create(:id => db.id, :config => db.config)
+          DatabaseServer.create(db.config.merge(id: db.id))
         end
       end
 
@@ -209,7 +209,7 @@ module Switchman
       end
 
       it "should return another server if it's the only one open" do
-        @db2 = DatabaseServer.create(:config => { :open => true})
+        @db2 = DatabaseServer.create(open: true)
         4.times { expect(DatabaseServer.server_for_new_shard).to eq @db2 }
         @db2.config.delete(:open)
         @db1.config[:open] = true
@@ -217,7 +217,7 @@ module Switchman
       end
 
       it "should return multiple open servers" do
-        @db2 = DatabaseServer.create(:config => { :open => true })
+        @db2 = DatabaseServer.create(open: true)
         @db1.config[:open] = true
         dbs = []
         20.times do

data/spec/lib/rails_spec.rb

@@ -5,7 +5,7 @@ module Switchman
     it "should automatically isolate cache keys from different shards" do
       cache = ::ActiveSupport::Cache.lookup_store(:memory_store)
       ::Rails.stubs(:cache).returns(cache)
-      db = DatabaseServer.create(:settings => { :adapter => 'sqlite3' })
+      db = DatabaseServer.create(adapter: 'sqlite3')
       s1 = db.shards.create!
       s2 = db.shards.create!
 

data/spec/lib/rake_spec.rb

@@ -13,7 +13,7 @@ module Switchman
       end
 
       def shard_scope(shard_ids)
-        Rake.send(:shard_scope, Shard.all, shard_ids)
+        Rake.send(:shard_scope, Shard.all, shard_ids).order(:id)
       end
 
       it "should work for default shard" do
@@ -88,5 +88,13 @@ module Switchman
         expect(shard_scope("7/7").to_a).to eq []
       end
     end
+
+    describe '.scope' do
+      it "supports selecting open servers" do
+        db = DatabaseServer.create(open: true)
+        shard = db.shards.create!
+        expect(Rake.scope(database_server: 'open').to_a).to eq([shard])
+      end
+    end
   end
 end

data/spec/lib/shackles_spec.rb

@@ -40,7 +40,7 @@ module Switchman
     it "should connect to the first working slave" do
       # have to unstub long enough to create this
       ::Rails.env.unstub(:test?)
-      ds = DatabaseServer.create(config: Shard.default.database_server.config.merge(
+      ds = DatabaseServer.create(Shard.default.database_server.config.merge(
         :slave => [{ host: 'some.postgres.server' }, nil]))
       ::Rails.env.stubs(:test?).returns(false)
       ds.shackle!
@@ -86,7 +86,7 @@ module Switchman
         Shard.default.database_server.shackle!
         # have to unstub long enough to create this
         ::Rails.env.unstub(:test?)
-        ds = DatabaseServer.create(config: { adapter: 'postgresql', host: 'notshackled', slave: { host: 'shackled' }})
+        ds = DatabaseServer.create(adapter: 'postgresql', host: 'notshackled', slave: { host: 'shackled' })
         ::Rails.env.stubs(:test?).returns(false)
         s = ds.shards.create!
         s.activate do

data/spec/models/shard_spec.rb

@@ -27,7 +27,7 @@ module Switchman
 
     describe ".destroy" do
       it "works on created shards" do
-        server = DatabaseServer.create(:config => Shard.default.database_server.config)
+        server = DatabaseServer.create(Shard.default.database_server.config)
         shard = server.create_new_shard
         expect{ shard.destroy }.to_not raise_error
         expect(Shard.where(id: shard.id)).to be_empty
@@ -35,7 +35,7 @@ module Switchman
 
       it "fails on the default shard" do
         shard = Shard.default
-        expect{ shard.destroy }.to raise_error
+        expect{ shard.destroy }.to raise_error("Cannot destroy the default shard")
       end
     end
 
@@ -83,7 +83,7 @@ module Switchman
     describe "#drop_database" do
       it "should work" do
         # use a separate connection so we don't commit the transaction
-        server = DatabaseServer.create(:config => Shard.default.database_server.config)
+        server = DatabaseServer.create(Shard.default.database_server.config)
         shard = server.create_new_shard
         shard.activate do
           User.create!
@@ -91,12 +91,12 @@ module Switchman
         end
         shard.drop_database
         shard.activate do
-          expect { User.count }.to raise_error
+          expect { User.count }.to raise_error(::ActiveRecord::StatementInvalid)
         end
       end
 
       it "raises an exception if the shard is the default shard" do
-        expect{ Shard.default.drop_database }.to raise_error
+        expect{ Shard.default.drop_database }.to raise_error("Cannot drop the database of the default shard")
       end
     end
 
@@ -123,7 +123,7 @@ module Switchman
     describe ".with_each_shard" do
       describe ":exception" do
         it "should default to :raise" do
-          expect { Shard.with_each_shard { raise "error" } }.to raise_error
+          expect { Shard.with_each_shard { raise "error" } }.to raise_error("error")
         end
 
         it "should :ignore" do
@@ -132,7 +132,7 @@ module Switchman
 
         it "should :defer" do
           counter = 0
-          expect { Shard.with_each_shard(exception: :defer) { counter += 1; raise "error" } }.to raise_error
+          expect { Shard.with_each_shard(exception: :defer) { counter += 1; raise "error" } }.to raise_error("error")
           # called more than once
           expect(counter).to be > 1
         end
@@ -279,19 +279,19 @@ module Switchman
       end
 
       it "should fall back to shard_name in the config if nil" do
-        db = DatabaseServer.new(config: { adapter: 'mysql', database: 'canvas', shard_name: 'yoyoyo' })
+        db = DatabaseServer.new(nil, adapter: 'mysql', database: 'canvas', shard_name: 'yoyoyo')
         shard = Shard.new(database_server: db)
         expect(shard.name).to eq 'yoyoyo'
       end
 
       it "should fall back to the database_server if nil" do
-        db = DatabaseServer.new(config: { adapter: 'mysql', database: 'canvas' })
+        db = DatabaseServer.new(nil, adapter: 'mysql', database: 'canvas')
         shard = Shard.new(database_server: db)
         expect(shard.name).to eq 'canvas'
       end
 
       it "should get it from the postgres connection if not otherwise specified" do
-        db = DatabaseServer.create(config: { adapter: 'postgresql', database: 'notme' })
+        db = DatabaseServer.create(adapter: 'postgresql', database: 'notme')
         shard = Shard.new(database_server: db)
         shard.database_server = db
         connection = mock()