pg_easy_replicate 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45fb127cf497feec36832e91ca67a54878d9fcf783cab3059aad366b0e99026
-  data.tar.gz: 989e3900bebfb04cb9af6037bf849da4f2ea9c6da9a9c6899d64a193ab507b93
+  metadata.gz: 5298b91d476da44069b1aac55bf32b8feb4bedbb07238d3588de101884f259b5
+  data.tar.gz: 6d083008edd3843635b691326d103eb9ee7a1d9eeccca4c62da6c15648d426ec
 SHA512:
-  metadata.gz: a5e5a55884a847b5bcfbaee5252704a60e2969c7dba7813fd35e875b2e381c65a7be5088c3042d4473acde9205b0423c59d22e0c9792178c9fd2e49e86b4ef4d
-  data.tar.gz: 17af5a3e97dc562970e3f84f1aa2eb4878159cf5bf8f4d1d7cccd3948ded00c7f2c2f003024281409e07a2d9e19bee1eab8aa7c9a5959eb7ebdc8d9c1da75f33
+  metadata.gz: 2789ca7abafaeab46264f5bdd1d633340c783b2a062e844d4d97e09a3b53af1023a20a66a1751caea781ce535a13f7563d9023ca98bbe1f723d95297e2462b87
+  data.tar.gz: a344c89598dfc0cc1980b18adb003e7e61191dcdeefd1a2dc23e399320b9ade642c46ee1317299acf24201840242a7fcfa7af0f2cf7265dc7451e22956cbb5ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_easy_replicate (0.1.10)
+    pg_easy_replicate (0.1.11)
       ougai (~> 2.0.0)
       pg (~> 1.5.3)
       sequel (>= 5.69, < 5.76)

data/lib/pg_easy_replicate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEasyReplicate
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/pg_easy_replicate.rb

@@ -140,10 +140,10 @@ module PgEasyReplicate
       if options[:everything]
         # Drop users at last
         logger.info("Dropping replication user on source database")
-        drop_user(conn_string: source_db_url, group_name: options[:group_name])
+        drop_user(conn_string: source_db_url)
 
         logger.info("Dropping replication user on target database")
-        drop_user(conn_string: target_db_url, group_name: options[:group_name])
+        drop_user(conn_string: target_db_url)
       end
     rescue => e
       abort_with("Unable to cleanup: #{e.message}")
@@ -266,8 +266,9 @@ module PgEasyReplicate
     )
       password = connection_info(conn_string)[:password].gsub("'") { "''" }
 
+      drop_user(conn_string: conn_string)
+
       sql = <<~SQL
-        drop role if exists #{quote_ident(internal_user_name)};
         create role #{quote_ident(internal_user_name)} with password '#{password}' login createdb createrole;
         grant all privileges on database #{quote_ident(db_name(conn_string))} TO #{quote_ident(internal_user_name)};
       SQL
@@ -305,10 +306,13 @@ module PgEasyReplicate
       raise "Unable to create user: #{e.message}"
     end
 
-    def drop_user(conn_string:, group_name:)
+    def drop_user(conn_string:, user: internal_user_name)
+      return unless user_exists?(conn_string: conn_string, user: user)
+
       sql = <<~SQL
-       revoke all privileges on database #{db_name(conn_string)} from #{quote_ident(internal_user_name)};
+       revoke all privileges on database #{db_name(conn_string)} from #{quote_ident(user)};
       SQL
+
       Query.run(
         query: sql,
         connection_url: conn_string,
@@ -316,7 +320,7 @@ module PgEasyReplicate
       )
 
       sql = <<~SQL
-        drop role if exists #{quote_ident(internal_user_name)};
+        drop role if exists #{quote_ident(user)};
       SQL
 
       Query.run(
@@ -327,5 +331,25 @@ module PgEasyReplicate
     rescue => e
       raise "Unable to drop user: #{e.message}"
     end
+
+    def user_exists?(conn_string:, user: internal_user_name)
+      sql = <<~SQL
+        SELECT r.rolname AS username,
+          r1.rolname AS "role"
+        FROM pg_catalog.pg_roles r
+        LEFT JOIN pg_catalog.pg_auth_members m ON (m.member = r.oid)
+        LEFT JOIN pg_roles r1 ON (m.roleid=r1.oid)
+        WHERE r.rolname = '#{user}'
+        ORDER BY 1;
+      SQL
+
+      Query
+        .run(
+          query: sql,
+          connection_url: conn_string,
+          user: db_user(conn_string),
+        )
+        .any? { |q| q[:username] == user }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_easy_replicate
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Shayon Mukherjee