ardb 0.4.0 → 0.4.1

data/lib/ardb/adapter/postgresql.rb

@@ -7,8 +7,8 @@ class Ardb::Adapter
 
     def public_schema_settings
       self.config_settings.merge({
-        :database           => 'postgres',
-        :schema_search_path => 'public'
+        'database'           => 'postgres',
+        'schema_search_path' => 'public'
       })
     end
 
@@ -20,7 +20,15 @@ class Ardb::Adapter
 
     def drop_db
       ActiveRecord::Base.establish_connection(self.public_schema_settings)
-      ActiveRecord::Base.connection.drop_database(self.database)
+      ActiveRecord::Base.connection.tap do |conn|
+        conn.execute "UPDATE pg_catalog.pg_database"\
+                     " SET datallowconn=false WHERE datname='#{self.database}'"
+        # this SELECT actually runs a command: it terminates all the connections
+        # http://www.postgresql.org/docs/9.2/static/functions-admin.html#FUNCTIONS-ADMIN-SIGNAL-TABLE
+        conn.execute "SELECT pg_terminate_backend(pid)"\
+                     " FROM pg_stat_activity WHERE datname='#{self.database}'"
+        conn.execute "DROP DATABASE IF EXISTS #{self.database}"
+      end
     end
 
     def drop_tables

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/unit/adapter/postgresql_tests.rb

@@ -14,8 +14,8 @@ class Ardb::Adapter::Postgresql
 
     should "know it's public schema connection settings" do
       exp_settings = subject.config_settings.merge({
-        :database => 'postgres',
-        :schema_search_path => 'public'
+        'database' => 'postgres',
+        'schema_search_path' => 'public'
       })
       assert_equal exp_settings, subject.public_schema_settings
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kelly Redding