switchman 1.0.0 → 1.2.0

data/spec/lib/connection_pool_proxy_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 module Switchman
   describe ConnectionPoolProxy do
+    include RSpecHelper
+
     it "should not share connections for sqlite shards on the same db" do
       @db = DatabaseServer.create(:config => { :adapter => 'sqlite3', :database => ':memory:' })
       @sqlite_shard1 = @db.shards.create!

data/spec/lib/database_server_spec.rb

@@ -66,12 +66,20 @@ 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:' })
-        create_shard(@db)
+        db = DatabaseServer.create(:config => { :adapter => 'sqlite3', :database => '%{shard_name}', :shard_name => ':memory:' })
+        begin
+          create_shard(db)
+        ensure
+          db.destroy
+        end
       end
 
-      it "should be able to create a new shard from the default db" do
-        create_shard(Shard.default.database_server)
+      context "non-transactional" do
+        self.use_transactional_fixtures = ::ActiveRecord::Base.connection.supports_ddl_transactions?
+
+        it "should be able to create a new shard from the default db" do
+          create_shard(Shard.default.database_server)
+        end
       end
 
       it "should be able to create a new shard from a db server that doesn't have any shards" do
@@ -79,8 +87,12 @@ module Switchman
         pending 'A "real" database"' unless %w{MySQL Mysql2 PostgreSQL}.include?(adapter)
 
         # So, it's really the same server, but we want separate connections
-        server = DatabaseServer.create(:config => Shard.default.database_server.config)
-        create_shard(server)
+        db = DatabaseServer.create(:config => Shard.default.database_server.config)
+        begin
+          create_shard(db)
+        ensure
+          db.destroy
+        end
       end
 
       class MyException < Exception; end

data/spec/lib/shackles_spec.rb

@@ -23,11 +23,13 @@ module Switchman
     end
 
     it "should correctly set up pools for sharding categories" do
-      models = ::ActiveRecord::Base.connection_handler.connection_pools
-      default_pools = Hash[models.map { |k, v| [k, v.current_pool] }]
+      models = ::ActiveRecord::Base.connection_handler.send(:class_to_pool)
+      default_pools = {}
+      models.each_pair { |k, v| default_pools[k] = v.current_pool }
       ::Shackles.activate(:slave_that_no_one_else_uses) do
-        models = ::ActiveRecord::Base.connection_handler.connection_pools
-        pools = Hash[models.map { |k, v| [k, v.current_pool] }]
+        models = ::ActiveRecord::Base.connection_handler.send(:class_to_pool)
+        pools = {}
+        models.each_pair { |k, v| pools[k] = v.current_pool }
         default_pools.keys.sort.should == pools.keys.sort
         default_pools.keys.each do |model|
           default_pools[model].should_not == pools[model]
@@ -71,7 +73,7 @@ module Switchman
 
         u = User.create!
         Shard.default.database_server.expects(:unshackle).once.returns([])
-        User.scoped(lock: true).first
+        User.lock.first
         Shard.default.database_server.expects(:unshackle).once.returns([])
         lambda { u.lock! }.should raise_error(::ActiveRecord::RecordNotFound)
       ensure
@@ -143,7 +145,7 @@ module Switchman
       end
 
       def actual_connection_count
-        ::ActiveRecord::Base.connection_pool.current_pool.instance_variable_get(:@reserved_connections).length
+        ::ActiveRecord::Base.connection_pool.current_pool.instance_variable_get(:@reserved_connections).size
       end
 
       it "should really return active connections to the pool in all envs" do