Quote indent DB name

shayonj · Dec 13, 2023 · 0f376ac · 0f376ac
1 parent 56169d9
commit 0f376ac
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 21 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -71,22 +71,26 @@ jobs:
 
           sudo su - postgres -c "createuser -p 5432 -d -s -e -l james-bond"
           sudo -u postgres psql -p 5432 -c 'alter user "james-bond" with encrypted password '"'"''"$PGPASSWORD"''"'"';'
+          sudo su - postgres -c "createdb -p 5432 postgres-db"
+          sudo -u postgres psql -p 5432 -c "grant all privileges on database \"postgres-db\" to \"james-bond\";"
 
           sudo su - postgres -c "createuser -p 5433 -d -s -e -l james-bond"
           sudo -u postgres psql -p 5433 -c 'alter user "james-bond" with encrypted password '"'"''"$PGPASSWORD"''"'"';'
+          sudo su - postgres -c "createdb -p 5433 postgres-db"
+          sudo -u postgres psql -p 5433 -c "grant all privileges on database \"postgres-db\" to \"james-bond\";"
 
           # Remove the escaped quote since we are passing the pwd to psql
           # String: james-bond123@7!'3aaR
           export PGPASSWORD='james-bond123@7!'"'"'3aaR'
-          psql -h localhost -d postgres -U james-bond -p 5432 -c 'ALTER SYSTEM SET wal_level = logical;'
-          psql -h localhost -d postgres -U james-bond -p 5433 -c 'ALTER SYSTEM SET wal_level = logical;'
+          psql -h localhost -d postgres-db -U james-bond -p 5432 -c 'ALTER SYSTEM SET wal_level = logical;'
+          psql -h localhost -d postgres-db -U james-bond -p 5433 -c 'ALTER SYSTEM SET wal_level = logical;'
 
           sudo systemctl restart postgresql@${{ matrix.pg.from }}-main.service
           sudo systemctl restart postgresql@${{ matrix.pg.to }}-main.service
           sudo systemctl restart postgresql
 
-          psql -h localhost -d postgres -U james-bond -p 5432 -c 'show wal_level;'
-          psql -h localhost -d postgres -U james-bond -p 5433 -c 'show wal_level;'
+          psql -h localhost -d postgres-db -U james-bond -p 5432 -c 'show wal_level;'
+          psql -h localhost -d postgres-db -U james-bond -p 5433 -c 'show wal_level;'
 
       - name: Run RSpec
         run: bundle exec rspec

diff --git a/.github/workflows/smoke.yaml b/.github/workflows/smoke.yaml
@@ -72,22 +72,26 @@ jobs:
 
           sudo su - postgres -c "createuser -p 5432 -d -s -e -l james-bond"
           sudo -u postgres psql -p 5432 -c 'alter user "james-bond" with encrypted password '"'"''"$PGPASSWORD"''"'"';'
+          sudo su - postgres -c "createdb -p 5432 postgres-db"
+          sudo -u postgres psql -p 5432 -c "grant all privileges on database \"postgres-db\" to \"james-bond\";"
 
           sudo su - postgres -c "createuser -p 5433 -d -s -e -l james-bond"
           sudo -u postgres psql -p 5433 -c 'alter user "james-bond" with encrypted password '"'"''"$PGPASSWORD"''"'"';'
+          sudo su - postgres -c "createdb -p 5433 postgres-db"
+          sudo -u postgres psql -p 5433 -c "grant all privileges on database \"postgres-db\" to \"james-bond\";"
 
           # Remove the escaped quote since we are passing the pwd to psql
           # String: james-bond123@7!'3aaR
           export PGPASSWORD='james-bond123@7!'"'"'3aaR'
-          psql -h localhost -d postgres -U james-bond -p 5432 -c 'ALTER SYSTEM SET wal_level = logical;'
-          psql -h localhost -d postgres -U james-bond -p 5433 -c 'ALTER SYSTEM SET wal_level = logical;'
+          psql -h localhost -d postgres-db -U james-bond -p 5432 -c 'ALTER SYSTEM SET wal_level = logical;'
+          psql -h localhost -d postgres-db -U james-bond -p 5433 -c 'ALTER SYSTEM SET wal_level = logical;'
 
           sudo systemctl restart postgresql@${{ matrix.pg.from }}-main.service
           sudo systemctl restart postgresql@${{ matrix.pg.to }}-main.service
           sudo systemctl restart postgresql
 
-          psql -h localhost -d postgres -U james-bond -p 5432 -c 'show wal_level;'
-          psql -h localhost -d postgres -U james-bond -p 5433 -c 'show wal_level;'
+          psql -h localhost -d postgres-db -U james-bond -p 5432 -c 'show wal_level;'
+          psql -h localhost -d postgres-db -U james-bond -p 5433 -c 'show wal_level;'
 
       - name: Run RSpec
         run: bundle exec rspec spec/smoke_spec.rb
diff --git a/docker-compose.yml b/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

diff --git a/lib/pg_easy_replicate.rb b/lib/pg_easy_replicate.rb
@@ -310,7 +310,7 @@ 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(user)};
+       revoke all privileges on database #{quote_ident(db_name(conn_string))} from #{quote_ident(user)};
       SQL
 
       Query.run(

diff --git a/scripts/e2e-bootstrap.sh b/scripts/e2e-bootstrap.sh
@@ -10,6 +10,6 @@ export SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhos
 export TARGET_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres"
 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
diff --git a/spec/database_helpers.rb b/spec/database_helpers.rb
@@ -8,20 +8,20 @@ def test_schema
   # We are use url encoded password below.
   # Original password is james-bond123@7!'3aaR
   def connection_url(user = "james-bond")
-    "postgres://#{user}:james-bond123%407%21%273aaR@localhost:5432/postgres"
+    "postgres://#{user}:james-bond123%407%21%273aaR@localhost:5432/postgres-db"
   end
 
   def target_connection_url(user = "james-bond")
-    "postgres://#{user}:james-bond123%407%21%273aaR@localhost:5433/postgres"
+    "postgres://#{user}:james-bond123%407%21%273aaR@localhost:5433/postgres-db"
   end
 
   def docker_compose_target_connection_url(user = "james-bond")
-    "postgres://#{user}:james-bond123%407%21%273aaR@target_db/postgres"
+    "postgres://#{user}:james-bond123%407%21%273aaR@target_db/postgres-db"
   end
 
   def docker_compose_source_connection_url(user = "james-bond")
     return connection_url(user) if ENV["GITHUB_WORKFLOW"] # if running in CI/github actions
-    "postgres://#{user}:james-bond123%407%21%273aaR@source_db/postgres"
+    "postgres://#{user}:james-bond123%407%21%273aaR@source_db/postgres-db"
   end
 
   def setup_tables(user = "james-bond", setup_target_db: true)
@@ -57,7 +57,7 @@ def setup_roles
       sql = <<~SQL
         drop role if exists #{PG::Connection.quote_ident("james-bond_role_regular")};
         create role #{PG::Connection.quote_ident("james-bond_role_regular")} WITH createrole createdb replication LOGIN PASSWORD 'james-bond123@7!''3aaR'; grant #{PG::Connection.quote_ident("james-bond_super_role")} to #{PG::Connection.quote_ident("james-bond_role_regular")};
-        grant all privileges on database postgres TO #{PG::Connection.quote_ident("james-bond_role_regular")};
+        grant all privileges on database #{PG::Connection.quote_ident("postgres-db")} TO #{PG::Connection.quote_ident("james-bond_role_regular")};
       SQL
       PgEasyReplicate::Query.run(
         query: sql,
@@ -77,14 +77,14 @@ def cleanup_roles
       if role == "james-bond_role_regular"
         PgEasyReplicate::Query.run(
           query:
-            "revoke all privileges on database postgres from #{PG::Connection.quote_ident("james-bond_role_regular")};",
+            "revoke all privileges on database #{PG::Connection.quote_ident("postgres-db")} from #{PG::Connection.quote_ident("james-bond_role_regular")};",
           connection_url: connection_url,
           user: "james-bond",
         )
 
         PgEasyReplicate::Query.run(
           query:
-            "revoke all privileges on database postgres from #{PG::Connection.quote_ident("james-bond_role_regular")};",
+            "revoke all privileges on database #{PG::Connection.quote_ident("postgres-db")} from #{PG::Connection.quote_ident("james-bond_role_regular")};",
           connection_url: target_connection_url,
           user: "james-bond",
         )
@@ -214,9 +214,9 @@ def vacuum_stats(url:, schema:)
   def self.populate_env_vars
     ENV[
       "SOURCE_DB_URL"
-    ] = "postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres"
+    ] = "postgres://james-bond:james-bond123%407%21%273aaR@localhost:5432/postgres-db"
     ENV[
       "TARGET_DB_URL"
-    ] = "postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres"
+    ] = "postgres://james-bond:james-bond123%407%21%273aaR@localhost:5433/postgres-db"
   end
 end