pgsync 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042c6ef2c6e17c85523588c23fb7d92dc23c625eeffd9f2988e56e346b6a46ec
-  data.tar.gz: 567458066a079635a0a887941d0c8da492acacae24f79f44d48195425a397d32
+  metadata.gz: b57c0423d780695d7379788efa869966318b23e3d8b9d92c8218ffb4cdee8609
+  data.tar.gz: 8e07cdad5a540c72df19ebdcbcc0e1c0e9930b6c4b1eb46f0bf318cada503bdc
 SHA512:
-  metadata.gz: c065a560b972175c371552ca69e7824d81d4bd1ebe72ed045ef5a5a59bcc28b738993019ca58231792f711a1f1acae4b42cb7ef68b73de83505c007a015e833d
-  data.tar.gz: c38db8ae37eca93353a5f354035fcb604e3e423b4b3fd58719b95c955fad7970990549109454f49392133860903d34d6ac0ca477f82ea1824b23435a9ae6db7e
+  metadata.gz: b91a30483535b049852ef679fe5944f065db7c56825a147775a904290c4a1e6221bfde512d7509cd475d97e5c8586c1107870cea4f19407782cd2f7caba88fc7
+  data.tar.gz: fbd6e09e5231a89824098c193d58f2debd90005df01fa432aff546e72ffc0b7ec6b951a237fb65f09ce640f28f6c660b29c77bc231744378055fe8b53e643b34

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.7.3 (2022-11-09)
+
+- Fixed issue with pg 1.4.4
+- Fixed output when `pg_restore` not found
+
+## 0.7.2 (2022-09-19)
+
+- Improved error message when a primary key is required
+- Switched to monotonic time
+- Fixed schema sync with Homebrew Postgres 14.5
+
 ## 0.7.1 (2022-07-06)
 
 - Fixed random letter data rule generating non-letter

data/README.md

@@ -19,7 +19,13 @@ pgsync is a command line tool. To install, run:
 gem install pgsync
 ```
 
-This will give you the `pgsync` command. You can also install it with [Homebrew](#homebrew). If installation fails, you may need to install [dependencies](#dependencies).
+This will give you the `pgsync` command. If installation fails, you may need to install [dependencies](#dependencies).
+
+You can also install it with Homebrew:
+
+```sh
+brew install pgsync
+```
 
 ## Setup
 
@@ -347,14 +353,17 @@ Bundler.with_unbundled_env do
 end
 ```
 
-## Homebrew
+## Docker
 
-On Mac, you can use:
+Get the [Docker image](https://hub.docker.com/r/ankane/pgsync) with:
 
 ```sh
-brew install ankane/brew/pgsync
+docker pull ankane/pgsync
+alias pgsync="docker run -ti ankane/pgsync"
 ```
 
+This will give you the `pgsync` command.
+
 ## Dependencies
 
 If installation fails, your system may be missing Ruby or libpq.
@@ -362,7 +371,7 @@ If installation fails, your system may be missing Ruby or libpq.
 On Mac, run:
 
 ```sh
-brew install postgresql
+brew install libpq
 ```
 
 On Ubuntu, run:
@@ -386,6 +395,18 @@ gem install specific_install
 gem specific_install https://github.com/ankane/pgsync.git
 ```
 
+With Homebrew, run:
+
+```sh
+brew upgrade pgsync
+```
+
+With Docker, run:
+
+```sh
+docker pull ankane/pgsync
+```
+
 ## Related Projects
 
 Also check out:

data/lib/pgsync/data_source.rb

@@ -19,11 +19,11 @@ module PgSync
     end
 
     def host
-      @host ||= conninfo[:host]
+      @host ||= dedup_localhost(conninfo[:host])
     end
 
     def port
-      @port ||= conninfo[:port]
+      @port ||= dedup_localhost(conninfo[:port])
     end
 
     def dbname
@@ -189,5 +189,15 @@ module PgSync
         conn.conninfo_hash
       end
     end
+
+    # for pg 1.4.4
+    # https://github.com/ged/ruby-pg/issues/490
+    def dedup_localhost(value)
+      if conninfo[:host] == "localhost,localhost" && conninfo[:port].to_s.split(",").uniq.size == 1
+        value.split(",")[0]
+      else
+        value
+      end
+    end
   end
 end

data/lib/pgsync/schema_sync.rb

@@ -17,6 +17,11 @@ module PgSync
         raise Error, "Cannot use --preserve with --schema-first or --schema-only"
       end
 
+      # generate commands before starting spinner
+      # for better error output if pg_restore not found
+      dump_command = dump_command()
+      restore_command = restore_command()
+
       show_spinner = output.tty? && !opts[:debug]
 
       if show_spinner
@@ -29,7 +34,7 @@ module PgSync
       # if spinner, capture lines to show on error
       lines = []
       success =
-        run_command do |line|
+        run_command(dump_command, restore_command) do |line|
           if show_spinner
             lines << line
           else
@@ -51,7 +56,7 @@ module PgSync
 
     private
 
-    def run_command
+    def run_command(dump_command, restore_command)
       err_r, err_w = IO.pipe
       Open3.pipeline_start(dump_command, restore_command, err: err_w) do |wait_thrs|
         err_w.close
@@ -62,8 +67,10 @@ module PgSync
       end
     end
 
-    def pg_restore_version
-      `pg_restore --version`.lines[0].chomp.split(" ")[-1].split(/[^\d.]/)[0]
+    # --if-exists introduced in Postgres 9.4
+    # not ideal, but simpler than trying to parse version
+    def supports_if_exists?
+      `pg_restore --help`.include?("--if-exists")
     rescue Errno::ENOENT
       raise Error, "pg_restore not found"
     end
@@ -80,7 +87,7 @@ module PgSync
 
     def restore_command
       cmd = ["pg_restore", "--verbose", "--no-owner", "--no-acl", "--clean"]
-      cmd << "--if-exists" if Gem::Version.new(pg_restore_version) >= Gem::Version.new("9.4.0")
+      cmd << "--if-exists" if supports_if_exists?
       cmd.concat(["-d", @destination.url])
     end
 

data/lib/pgsync/sync.rb

@@ -8,7 +8,7 @@ module PgSync
     end
 
     def perform
-      started_at = Time.now
+      started_at = monotonic_time
 
       args = @arguments
       opts = @options
@@ -129,7 +129,7 @@ module PgSync
     end
 
     def log_completed(started_at)
-      time = Time.now - started_at
+      time = monotonic_time - started_at
       message = "Completed in #{time.round(1)}s"
       log colorize(message, :green)
     end

data/lib/pgsync/table_sync.rb

@@ -189,11 +189,11 @@ module PgSync
           log message.sub(":spinner", "⠋")
         end
 
-        started_at[task] = Time.now
+        started_at[task] = monotonic_time
       end
 
       finish = lambda do |task, i, result|
-        time = (Time.now - started_at[task]).round(1)
+        time = (monotonic_time - started_at[task]).round(1)
 
         success = result[:status] == "success"
 

data/lib/pgsync/task.rb

@@ -88,7 +88,7 @@ module PgSync
 
       copy_to_command = "COPY (SELECT #{copy_fields} FROM #{quoted_table}#{sql_clause}) TO STDOUT"
       if opts[:in_batches]
-        raise Error, "No primary key" if primary_key.empty?
+        raise Error, "Primary key required for --in-batches" if primary_key.empty?
         primary_key = primary_key.first
 
         destination.truncate(table) if opts[:truncate]
@@ -125,7 +125,11 @@ module PgSync
           end
         end
       elsif !opts[:truncate] && (opts[:overwrite] || opts[:preserve] || !sql_clause.empty?)
-        raise Error, "No primary key" if primary_key.empty?
+        if primary_key.empty?
+          raise Error, "Primary key required for --overwrite" if opts[:overwrite]
+          raise Error, "Primary key required for --preserve" if opts[:preserve]
+          raise Error, "Primary key required to sync specific rows"
+        end
 
         # create a temp table
         temp_table = "pgsync_#{rand(1_000_000_000)}"

data/lib/pgsync/utils.rb

@@ -83,5 +83,9 @@ module PgSync
     def quote_string(s)
       s.gsub(/\\/, '\&\&').gsub(/'/, "''")
     end
+
+    def monotonic_time
+      Process.clock_gettime(Process::CLOCK_MONOTONIC)
+    end
   end
 end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.7.1"
+  VERSION = "0.7.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel