pg_easy_replicate 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d97a0f8505fef3ac73849e6964d1204c72545eb52fb4059d2c1119ea62228d
-  data.tar.gz: 8ad93a08e70da1945e091110064a9b4be569c2a77328f9960cd7ce52c6becefa
+  metadata.gz: 02ca1ab51b854644e7a44fcb9a166a363b608784f4c38a6872cc6be5d35b21f3
+  data.tar.gz: dfb7b875e61b5c032940af84417ce7cf35b75897039ba4efd400513d7da5de20
 SHA512:
-  metadata.gz: 895ca04cdabbf15a082b1623890d55e650398f07eb144b2a0c8cf2877557a857926e24bfc336046afdd5097dbd5042d43d344e095338d6ffdb8f259797536c10
-  data.tar.gz: 41dd6428dd0f8c54de4d4b97931d573a0b2ae5fd4f5d61e2908d2e88e7fff0a97ed13c841a8fa2b924bacda0e8ae4c496d3f533d1398be7b15ffe0aa0ba6304a
+  metadata.gz: 698b38142b8f8a8c9a64623d9a3bb06791a3a5bc174c4abffc49a480787d6cf33a002b75e9e6a61c23f443c962818544ef3c98fab5970bc1bccf1224ebaa8cb6
+  data.tar.gz: f6942a91cade0e60c9c5e245f4cabe9a7d0e698316855c7eacbd53bc1b2769a3d465e12dc7e1cda34f10149b24b3bfde35a585ab6b8583f9645b9faae5439021

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pg_easy_replicate (0.1.8)
+    pg_easy_replicate (0.1.9)
       ougai (~> 2.0.0)
       pg (~> 1.5.3)
       sequel (>= 5.69, < 5.71)
@@ -37,7 +37,7 @@ GEM
     rake (13.0.6)
     rbs (3.1.0)
     regexp_parser (2.8.1)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -51,7 +51,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.54.2)
+    rubocop (1.55.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -59,7 +59,7 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.28.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.29.0)
@@ -75,7 +75,7 @@ GEM
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.22.0)
+    rubocop-rspec (2.23.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

data/docker-compose.yml

@@ -5,8 +5,8 @@ services:
     ports:
       - "5432:5432"
     environment:
-      POSTGRES_USER: jamesbond
-      POSTGRES_PASSWORD: jamesbond123@7!'3aaR
+      POSTGRES_USER: james-bond
+      POSTGRES_PASSWORD: james-bond123@7!'3aaR
       POSTGRES_DB: postgres
     command: >
       -c wal_level=logical
@@ -21,8 +21,8 @@ services:
     ports:
       - "5433:5432"
     environment:
-      POSTGRES_USER: jamesbond
-      POSTGRES_PASSWORD: jamesbond123@7!'3aaR
+      POSTGRES_USER: james-bond
+      POSTGRES_PASSWORD: james-bond123@7!'3aaR
       POSTGRES_DB: postgres
     command: >
       -c wal_level=logical

data/lib/pg_easy_replicate/helper.rb

@@ -43,6 +43,10 @@ module PgEasyReplicate
         .downcase
     end
 
+    def quote_ident(sql_ident)
+      PG::Connection.quote_ident(sql_ident)
+    end
+
     def test_env?
       ENV.fetch("RACK_ENV", nil) == "test"
     end

data/lib/pg_easy_replicate/orchestrate.rb

@@ -94,7 +94,8 @@ module PgEasyReplicate
           .map do |table_name|
             Query.run(
               query:
-                "ALTER PUBLICATION #{publication_name(group_name)} ADD TABLE \"#{table_name}\"",
+                "ALTER PUBLICATION #{quote_ident(publication_name(group_name))}
+                        ADD TABLE #{quote_ident(table_name)}",
               connection_url: conn_string,
               schema: schema,
             )
@@ -107,7 +108,11 @@ module PgEasyReplicate
         Query
           .run(
             query:
-              "SELECT table_name FROM information_schema.tables WHERE table_schema = '#{schema}' ORDER BY table_name",
+              "SELECT table_name
+               FROM information_schema.tables
+               WHERE table_schema = '#{schema}' AND
+                 table_type = 'BASE TABLE'
+               ORDER BY table_name",
             connection_url: conn_string,
           )
           .map(&:values)
@@ -121,7 +126,8 @@ module PgEasyReplicate
           { publication_name: publication_name(group_name) },
         )
         Query.run(
-          query: "DROP PUBLICATION IF EXISTS #{publication_name(group_name)}",
+          query:
+            "DROP PUBLICATION IF EXISTS #{quote_ident(publication_name(group_name))}",
           connection_url: conn_string,
           user: db_user(conn_string),
         )
@@ -144,7 +150,9 @@ module PgEasyReplicate
 
         Query.run(
           query:
-            "CREATE SUBSCRIPTION #{subscription_name(group_name)} CONNECTION '#{source_conn_string}' PUBLICATION #{publication_name(group_name)}",
+            "CREATE SUBSCRIPTION #{quote_ident(subscription_name(group_name))}
+                      CONNECTION '#{source_conn_string}'
+                      PUBLICATION #{quote_ident(publication_name(group_name))}",
           connection_url: target_conn_string,
           user: db_user(target_conn_string),
           transaction: false,
@@ -282,7 +290,7 @@ module PgEasyReplicate
         )
 
         alter_sql =
-          "ALTER USER #{db_user(source_db_url)} set default_transaction_read_only = true"
+          "ALTER USER #{quote_ident(db_user(source_db_url))} set default_transaction_read_only = true"
         Query.run(query: alter_sql, connection_url: source_db_url)
 
         kill_sql =
@@ -297,7 +305,7 @@ module PgEasyReplicate
         logger.info("Restoring connections")
 
         alter_sql =
-          "ALTER USER #{db_user(source_db_url)} set default_transaction_read_only = false"
+          "ALTER USER #{quote_ident(db_user(source_db_url))} set default_transaction_read_only = false"
         Query.run(query: alter_sql, connection_url: source_db_url)
       end
 

data/lib/pg_easy_replicate/query.rb

@@ -17,12 +17,12 @@ module PgEasyReplicate
         if transaction
           r =
             conn.transaction do
-              conn.run("SET search_path to #{schema}") if schema
+              conn.run("SET search_path to #{quote_ident(schema)}") if schema
               conn.run("SET statement_timeout to '5s'")
               conn.fetch(query).to_a
             end
         else
-          conn.run("SET search_path to #{schema}") if schema
+          conn.run("SET search_path to #{quote_ident(schema)}") if schema
           conn.run("SET statement_timeout to '5s'")
           r = conn.fetch(query).to_a
         end

data/lib/pg_easy_replicate/version.rb

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

data/lib/pg_easy_replicate.rb

@@ -5,6 +5,7 @@ require "ougai"
 require "pg"
 require "sequel"
 require "open3"
+require "English"
 
 require "pg_easy_replicate/helper"
 require "pg_easy_replicate/version"
@@ -152,7 +153,8 @@ module PgEasyReplicate
 
     def drop_internal_schema
       Query.run(
-        query: "DROP SCHEMA IF EXISTS #{internal_schema_name} CASCADE",
+        query:
+          "DROP SCHEMA IF EXISTS #{quote_ident(internal_schema_name)} CASCADE",
         connection_url: source_db_url,
         schema: internal_schema_name,
         user: db_user(target_db_url),
@@ -163,9 +165,9 @@ module PgEasyReplicate
 
     def setup_internal_schema
       sql = <<~SQL
-        create schema if not exists #{internal_schema_name};
-        grant usage on schema #{internal_schema_name} to #{db_user(source_db_url)};
-        grant create on schema #{internal_schema_name} to #{db_user(source_db_url)};
+        create schema if not exists #{quote_ident(internal_schema_name)};
+        grant usage on schema #{quote_ident(internal_schema_name)} to #{quote_ident(db_user(source_db_url))};
+        grant create on schema #{quote_ident(internal_schema_name)} to #{quote_ident(db_user(source_db_url))};
       SQL
 
       Query.run(
@@ -273,9 +275,9 @@ module PgEasyReplicate
       password = connection_info(conn_string)[:password].gsub("'") { "''" }
 
       sql = <<~SQL
-        drop role if exists #{internal_user_name};
-        create role #{internal_user_name} with password '#{password}' login createdb createrole;
-        grant all privileges on database #{db_name(conn_string)} TO #{internal_user_name};
+        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
 
       Query.run(
@@ -287,9 +289,9 @@ module PgEasyReplicate
 
       sql =
         if special_user_role
-          "grant #{special_user_role} to #{internal_user_name};"
+          "grant #{quote_ident(special_user_role)} to #{quote_ident(internal_user_name)};"
         else
-          "alter user #{internal_user_name} with superuser;"
+          "alter user #{quote_ident(internal_user_name)} with superuser;"
         end
 
       Query.run(
@@ -302,7 +304,7 @@ module PgEasyReplicate
       return unless grant_permissions_on_schema
       Query.run(
         query:
-          "grant all on schema #{internal_schema_name} to #{internal_user_name}",
+          "grant all on schema #{quote_ident(internal_schema_name)} to #{quote_ident(internal_user_name)}",
         connection_url: conn_string,
         user: db_user(conn_string),
         transaction: false,
@@ -313,7 +315,7 @@ module PgEasyReplicate
 
     def drop_user(conn_string:, group_name:)
       sql = <<~SQL
-       revoke all privileges on database #{db_name(conn_string)} from #{internal_user_name};
+       revoke all privileges on database #{db_name(conn_string)} from #{quote_ident(internal_user_name)};
       SQL
       Query.run(
         query: sql,
@@ -322,7 +324,7 @@ module PgEasyReplicate
       )
 
       sql = <<~SQL
-        drop role if exists #{internal_user_name};
+        drop role if exists #{quote_ident(internal_user_name)};
       SQL
 
       Query.run(

data/scripts/e2e-bootstrap.sh

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

data/scripts/e2e-start.sh

@@ -3,12 +3,12 @@
 set -eo pipefail
 
 if [[ -z ${GITHUB_WORKFLOW} ]]; then
-  export SECONDARY_SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@source_db/postgres"
+  export SECONDARY_SOURCE_DB_URL="postgres://james-bond:james-bond123%407%21%273aaR@source_db/postgres"
 fi
 
-export SOURCE_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5432/postgres"
-export TARGET_DB_URL="postgres://jamesbond:jamesbond123%407%21%273aaR@localhost:5433/postgres"
-export PGPASSWORD='jamesbond123@7!'"'"''"'"'3aaR'
+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 PGPASSWORD='james-bond123@7!'"'"''"'"'3aaR'
 
 # Bootstrap and cleanup
 echo "===== Performing Bootstrap and cleanup"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_easy_replicate
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Shayon Mukherjee
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-23 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ougai