baza 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e9903b9842c231693bf971405eee288676a0f1
-  data.tar.gz: 285cc1660fb2b723b17f7b2ca33235a66ee25779
+  metadata.gz: cb297db4bf6ce61024aa2d6c3eb6150ce3e3e001
+  data.tar.gz: 900c0cbe5f25dfbf0678bd061b708464ec2b2273
 SHA512:
-  metadata.gz: d89f9dd25564cab7e27b25b5f06669c896bfb6e1e8c1b78765c8c017b6050709f8e7c49f5378310198658423f754c16afc716378c5755407e65d613b5052b0bf
-  data.tar.gz: aa2c56601b530a92e32cda1f5592a1c9cb59df765124054064769c3d9637cf3349d4248a78d0919a7eb9b6656653f0902dee72c2763bd60e90bc51d2e8c5f22b
+  metadata.gz: 3cbc663078dfc995306e13182a7d03d4c20dd8e8ea199e9eabeb2ba557a5d281cce95c4099aefbf899cf239a145073f1e6a710fb4a44f636446cc05f1421f084
+  data.tar.gz: 53f651203f8a12dc35062b41bdb22a9f370ef813fe794cb1bb4e2cf25fae449a4dc5d9e87b6fb3bfa323141c3525826553e26f5acf391d1d58a78abe2c0b1f9e

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.27

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.26 ruby lib
+# stub: baza 0.0.27 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.26"
+  s.version = "0.0.27"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kasper Johansen".freeze]
-  s.date = "2017-02-15"
+  s.date = "2017-03-19"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [

data/lib/baza/db.rb

@@ -348,25 +348,6 @@ class Baza::Db
     ret
   end
 
-  # Clones the connection, executes the given block and closes the connection again.
-  #
-  #===Examples
-  # db.cloned_conn do |conn|
-  #   conn.q('SELCET * FROM users') do |data|
-  #     print data[:name]
-  #   end
-  # end
-  def cloned_conn(args = nil, &_block)
-    clone_conn_args = args[:clone_args] || {}
-    dbconn = clone_conn(clone_conn_args)
-
-    begin
-      yield(dbconn)
-    ensure
-      dbconn.close
-    end
-  end
-
   # Yields a query-buffer and flushes at the end of the block given.
   def q_buffer(args = {}, &block)
     Baza::QueryBuffer.new(args.merge(db: self), &block)

data/lib/baza/driver/pg/database.rb

@@ -5,7 +5,18 @@ class Baza::Driver::Pg::Database < Baza::Database
   end
 
   def drop
-    @db.query("DROP DATABASE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database}")
+    other_db = @db.databases.list.find { |database| database.name != @db.current_database }
+
+    # Drop database through a cloned connection, because Postgres might bug up if dropping the current
+    @db.clone_conn(db: other_db.name) do |cloned_conn|
+      # Close existing connections to avoid 'is being accessed by other users' errors
+      cloned_conn.query("REVOKE CONNECT ON DATABASE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database} FROM public")
+      cloned_conn.query("SELECT pid, pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = #{@db.sep_val}#{@db.esc(name)}#{@db.sep_val} AND pid != pg_backend_pid()")
+
+      # Drop the database
+      cloned_conn.query("DROP DATABASE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database}")
+    end
+
     self
   end
 

data/spec/info_active_record_mysql2_travis.rb

@@ -9,7 +9,7 @@ class Baza::InfoActiveRecordMysql2
       adapter: "mysql2",
       host: "localhost",
       database: "baza",
-      username: "travis"
+      username: "build"
     )
     @conn = @conn_pool.connection
 

data/spec/info_active_record_mysql_travis.rb

@@ -9,7 +9,7 @@ class Baza::InfoActiveRecordMysql
       adapter: "mysql",
       host: "localhost",
       database: "baza",
-      username: "travis"
+      username: "build"
     )
     @conn ||= @conn_pool.connection
 

data/spec/info_mysql2_travis.rb

@@ -5,7 +5,7 @@ class Baza::InfoMysql2
     @db = Baza::Db.new({
       type: :mysql2,
       host: "localhost",
-      user: "travis",
+      user: "build",
       db: "baza"
     }.merge(args))
   end

data/spec/info_mysql_travis.rb

@@ -5,7 +5,7 @@ class Baza::InfoMysql
     @db = Baza::Db.new({
       type: :mysql,
       host: "localhost",
-      user: "travis",
+      user: "build",
       db: "baza"
     }.merge(args))
   end

data/spec/support/driver_databases_collection.rb

@@ -30,7 +30,6 @@ shared_examples_for "a baza databases driver" do
 
   it "creates tables" do
     if test_database.table_exists?("test")
-      puts "DROPPING TEST TABLE"
       test_database.table("test").drop
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-15 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator