baza 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a62941ce9303dc76e57c84b8db5045e9ffb060a6
-  data.tar.gz: 88ab7cd45d1f8caf0fdb1139edb27931a3f0dfbc
+  metadata.gz: fb0c9dc47499fc957724e7051425231c423e40be
+  data.tar.gz: 8b5e83c0d0d78e16c16462b338d3e6cd0150fabf
 SHA512:
-  metadata.gz: e8797dfcd1e18c7d0de33f048e7de2e903caa48c6abb10be47cf0b4e075ebc7607f27373497633ab23e79c5b3064d9ecf110d20a07a063c2904e1b6f0fdf23e1
-  data.tar.gz: 59a1951ceea82bc29831ceeea9751f0755de1bc1ffa7ce89970c2492e51d2bd933eb7c730c190d141468e0ad75f7b10a1137e50aed030e0d3a26808726a54edf
+  metadata.gz: 11bb9bb3e0d6c1da04cc4881b354db53e2477607d4b272dc2c416447678fee26c7fa4aaa68b62c49f856e60b3c638d0091f5c47f4c574841040aeff03b5023d8
+  data.tar.gz: 0ff63d05d3441aa25dbc726a3fe86b5beed0910923db5187892f31a852925aaffc242a9df347cd8031fb59c6c59b2e2a44a0832eb993eb64a4a8e41db7c7850f

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

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.28 ruby lib
+# stub: baza 0.0.29 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   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-07-03"
+  s.date = "2017-10-11"
   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/database.rb

@@ -1,10 +1,10 @@
 class Baza::Database
   include Baza::DatabaseModelFunctionality
 
-  attr_reader :db, :driver, :name_was
-  attr_accessor :name
+  attr_reader :db, :driver, :name
 
   def initialize(args)
+    @changes = {}
     @db = args.fetch(:db)
     @driver = args.fetch(:driver)
     @name = args.fetch(:name)
@@ -19,6 +19,19 @@ class Baza::Database
     end
   end
 
+  def name=(new_name)
+    @changes[:name] = new_name
+    @name = new_name
+  end
+
+  def name_changed?
+    @changes.key?(:name) && @changes.fetch(:name).to_s != name.to_s
+  end
+
+  def name_was
+    @changes[:name]
+  end
+
   def tables(args = {})
     list_args = {database: name}
     list_args[:name] = args.fetch(:name) if args[:name]

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

@@ -5,16 +5,9 @@ class Baza::Driver::Pg::Database < Baza::Database
   end
 
   def drop
-    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()")
-
+    with_cloned_conn_and_terminated_connections do |cloned_conn|
       # Drop the database
-      cloned_conn.query("DROP DATABASE #{@db.sep_database}#{@db.escape_database(name)}#{@db.sep_database}")
+      cloned_conn.query("DROP DATABASE #{db.sep_database}#{db.escape_database(name)}#{db.sep_database}")
     end
 
     self
@@ -36,9 +29,9 @@ class Baza::Driver::Pg::Database < Baza::Database
     where_args[:table_name] = args.fetch(:name) if args[:name]
 
     use do
-      @db.select([:information_schema, :tables], where_args, orderby: :table_name) do |table_data|
+      db.select([:information_schema, :tables], where_args, orderby: :table_name) do |table_data|
         table = Baza::Driver::Pg::Table.new(
-          driver: @db.driver,
+          driver: db.driver,
           data: table_data
         )
 
@@ -56,7 +49,7 @@ class Baza::Driver::Pg::Database < Baza::Database
   end
 
   def use(&blk)
-    @db.with_database(name, &blk)
+    db.with_database(name, &blk)
     self
   end
 
@@ -64,13 +57,29 @@ class Baza::Driver::Pg::Database < Baza::Database
   # Creates a new table by the given name and data.
   def create_table(table_name, data, args = nil)
     use do
-      @db.tables.create(table_name, data, args)
+      db.tables.create(table_name, data, args)
     end
   end
 
   def rename(new_name)
-    @db.query("ALTER DATABASE #{@db.sep_database}#{@db.escape_database(name_was)}#{@db.sep_database} RENAME TO #{@db.sep_database}#{@db.escape_database(new_name)}#{@db.sep_database}")
+    with_cloned_conn_and_terminated_connections do |cloned_conn|
+      cloned_conn.query("ALTER DATABASE #{db.sep_database}#{db.escape_database(name_was)}#{db.sep_database} RENAME TO #{db.sep_database}#{db.escape_database(new_name)}#{db.sep_database}")
+    end
+
     @name = new_name.to_s
     self
   end
+
+  def with_cloned_conn_and_terminated_connections
+    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") unless name_changed?
+      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()")
+
+      yield cloned_conn
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-03 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator