pg_easy_replicate 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d45fb127cf497feec36832e91ca67a54878d9fcf783cab3059aad366b0e99026
-  data.tar.gz: 989e3900bebfb04cb9af6037bf849da4f2ea9c6da9a9c6899d64a193ab507b93
+  metadata.gz: 6d7321dd7ea830328c42f49d3e12c14df7f2b7d9cf1448fd61a46b2236847239
+  data.tar.gz: d3aad658eab7c86766c4528c89bcd8718376504d97ca7d1cb356f7b7faa116d2
 SHA512:
-  metadata.gz: a5e5a55884a847b5bcfbaee5252704a60e2969c7dba7813fd35e875b2e381c65a7be5088c3042d4473acde9205b0423c59d22e0c9792178c9fd2e49e86b4ef4d
-  data.tar.gz: 17af5a3e97dc562970e3f84f1aa2eb4878159cf5bf8f4d1d7cccd3948ded00c7f2c2f003024281409e07a2d9e19bee1eab8aa7c9a5959eb7ebdc8d9c1da75f33
+  metadata.gz: 7cd29a4307b130f291007dec2f9a9e5abb5227cd892349181391fce74d9c032dc9c823e44e90ba07959d3630c191f16968d6442689849199e7f98268dc5e0244
+  data.tar.gz: efff8b0ea2b1c9890a70306e83d75c6e35fa78645658d914c92a8142842834fd731cd2b707ab150e4ef043f7d3e85291eaa320b14db56a8f0867b8db94824b67

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_easy_replicate (0.1.10)
+    pg_easy_replicate (0.1.12)
       ougai (~> 2.0.0)
       pg (~> 1.5.3)
       sequel (>= 5.69, < 5.76)
@@ -76,8 +76,8 @@ GEM
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.24.1)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)

data/docker-compose.yml

@@ -7,7 +7,7 @@ services:
     environment:
       POSTGRES_USER: james-bond
       POSTGRES_PASSWORD: james-bond123@7!'3aaR
-      POSTGRES_DB: postgres
+      POSTGRES_DB: postgres-db
     command: >
       -c wal_level=logical
       -c ssl=on
@@ -23,7 +23,7 @@ services:
     environment:
       POSTGRES_USER: james-bond
       POSTGRES_PASSWORD: james-bond123@7!'3aaR
-      POSTGRES_DB: postgres
+      POSTGRES_DB: postgres-db
     command: >
       -c wal_level=logical
       -c ssl=on

data/lib/pg_easy_replicate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgEasyReplicate
-  VERSION = "0.1.10"
+  VERSION = "0.1.12"
 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 #{quote_ident(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

data/scripts/e2e-bootstrap.sh

@@ -3,13 +3,13 @@
 set -eo pipefail
 
 if [[ -z ${GITHUB_WORKFLOW} ]]; then
-  export SECONDARY_SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@source_db/postgres"
+  export SECONDARY_SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@source_db/postgres-db"
 fi
 
-export SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres"
-export TARGET_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres"
+export SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres-db"
+export TARGET_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres-db"
 export PGPASSWORD='james-bond123@7!'"'"'3aaR'
 
-pgbench --initialize -s 5 --foreign-keys --host localhost -U james-bond -d postgres
+pgbench --initialize -s 5 --foreign-keys --host localhost -U james-bond -d postgres-db
 
 bundle exec bin/pg_easy_replicate config_check --copy-schema

data/scripts/e2e-start.sh

@@ -3,11 +3,11 @@
 set -eo pipefail
 
 if [[ -z ${GITHUB_WORKFLOW} ]]; then
-  export SECONDARY_SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@source_db/postgres"
+  export SECONDARY_SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@source_db/postgres-db"
 fi
 
-export SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres"
-export TARGET_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres"
+export SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres-db"
+export TARGET_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres-db"
 export PGPASSWORD='james-bond123@7!'"'"''"'"'3aaR'
 
 # Bootstrap and cleanup

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_easy_replicate
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.12
 platform: ruby
 authors:
 - Shayon Mukherjee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ougai