pgmove 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4bdb34270ae8240009139e9b9055e2ce337a478
-  data.tar.gz: a609d0f8e4bebe8b4ef7a6cd4f58274fad5e4de5
+  metadata.gz: 0058ca9cae26f102cb737c5bbddfa5fc1cd2303e
+  data.tar.gz: 4ee6d28a48f312ec2e8fb08b2361c274c79bbb8d
 SHA512:
-  metadata.gz: dff8542bf01414b391894c9e48829010844ca753876f7070fc2a99797ea81546372cd7fcce60ff24fdbbddbebe38a1bd6578816781aaf41a3445b0fa23786978
-  data.tar.gz: 51ca86ce8e726d30ee58440e9d7a6054c7bf4f298a1473f8110fc364cb09c10234deca6c3feab58469969d6626e9561e9ec86ec92db430967a1dc264d02d0bb7
+  metadata.gz: 6cab6cabfc2672a336aa23589a6b472b6db9373d8024bdad62ab9f951266cda728c459a4f85106a464cc7c7e8f7470b645bff170c0750232165aaaa45bc41115
+  data.tar.gz: eab66862325c672359c553fb3b28de88f98c6c8bad49c7d3a376b84ee3a895aa62e3cf80d17d16615fd6f1acc155f03c7051bef99dc884fac9640fbaccd31caf

data/lib/pgmove/bucardo.rb

@@ -74,8 +74,11 @@ module Pgmove
     end
 
     def finalize
-      stop
-      reset_src
+      @src_db.disable do |conn|
+        sleep 5
+        stop
+        remove_bucardo conn
+      end
       @dest_db.finalize
     end
 
@@ -100,9 +103,14 @@ module Pgmove
     end
 
     def reset_src
-      system! %(psql "#{@src_db.conn_str}" -c 'DROP schema if exists bucardo cascade')
-      system! %(psql "#{@src_db.conn_str}" -c 'DROP database IF EXISTS bucardo')
-      system! %(psql "#{@src_db.conn_str}" -c 'drop role IF EXISTS bucardo')
+      @src_db.pg_conn { |conn| remove_bucardo conn }
+    end
+
+    def remove_bucardo(conn)
+      logger.bullet "removing bucardo"
+      conn.exec "DROP schema if exists bucardo cascade"
+      conn.exec "DROP database IF EXISTS bucardo"
+      conn.exec "drop role IF EXISTS bucardo"
     end
 
     def install

data/lib/pgmove/db.rb

@@ -30,6 +30,29 @@ module Pgmove
       psql_raw "-f #{path}"
     end
 
+    def disable
+      new_name = "#{@name}_pgmove_disabled"
+      disable_sql = "update pg_database set datallowconn = false where datname = '#{@name}'"
+      stop_activity_sql = <<~SQL
+        select pg_terminate_backend(pid) from pg_stat_activity
+        where datname = '#{@name}'
+        AND COALESCE(application_name, '') NOT LIKE 'bucardo%' 
+        AND COALESCE(application_name, '') NOT LIKE 'pgmove'
+      SQL
+      rename_sql = "ALTER DATABASE #{@name} RENAME to #{new_name}"
+      dbconn = pg_conn
+      pg_conn("postgres") do |conn|
+        logger.bullet "sql: #{disable_sql}"
+        conn.exec disable_sql
+        logger.bullet "sql: #{stop_activity_sql}"
+        conn.exec stop_activity_sql
+        yield dbconn
+        dbconn.close
+        logger.bullet "sql: #{rename_sql}"
+        conn.exec rename_sql
+      end
+    end
+
     def finalize
       psql "ALTER DATABASE #{@name} RENAME to #{@final_name}", db: "postgres"
     end
@@ -80,13 +103,15 @@ module Pgmove
       end
     end
 
-    def pg_conn
+    def pg_conn(db = nil)
+      db ||= @name
       conn = PG::Connection.open(
-        :dbname => @name, 
-        :user => @user, 
-        :password => @pass, 
-        :host => @host, 
-        :port => @port
+        dbname: db,
+        user: @user,
+        password: @pass,
+        host: @host,
+        port: @port,
+        application_name: "pgmove"
       )
       if block_given?
         yield conn

data/lib/pgmove/version.rb

@@ -1,3 +1,3 @@
 module Pgmove
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgmove
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Neeraj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg