pgsync 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bb82b59d50e88dd20c969af273b2a0caeee6764
-  data.tar.gz: 291db7c3a69dcb341c9079f13635bbd057d5ea06
+  metadata.gz: 5965c8b07a78e8b6a7366c82f62a671c5132680f
+  data.tar.gz: fd0eb3f98cb80da49994b432a16da3b502f1e7e1
 SHA512:
-  metadata.gz: bd3ad5d52e94b6ed1466ee49ebb843ea74cc9ec1397d56587972c4d1388b707bb98d1921ee26f96393a27cd6b254973cf804770ab4514a325b8621797c58ff36
-  data.tar.gz: 06ab1eab6b466d21f9d641b3aaeb5134caaa372db806efcd860dd3cf6a28cf4b22c7a417d88af8bc2463e2fee1f2a83dd447711547298e0fe29aa7a45ff92f31
+  metadata.gz: 5de08c4e8f0bb3d9375c2b29a13f7e9acfc9d1e123ce132f9563a78dc770b92c0f19a5b25f63c8c2c3862c3efbaa59eeea6f4988e79ff9670040667e90ab181e
+  data.tar.gz: 7a751f528cfc295a71e2dc3123d4c17fe635dfff5b451baa76ec24d6343578afe2921caa28b15f576bd867ce73a1fad8b3c0d294361eeb272edc711c115cff8b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.2.0
+
+- Fixed idle transaction timeout errors - respects `statement_timeout` as a result
+- Raise error when command exits with non-zero status
+
 # 0.1.1
 
 - Better support for multiple databases

data/bin/pgsync

@@ -5,4 +5,6 @@ begin
   PgSync::Client.new(ARGV).perform
 rescue PgSync::Error => e
   abort e.message
+rescue Interrupt => e
+  # do nothing
 end

data/lib/pgsync.rb

@@ -150,25 +150,16 @@ module PgSync
                       seq_values[seq] = from_connection.exec("select last_value from #{seq}").to_a[0]["last_value"]
                     end
 
-                    # use transaction to revert statement timeout
-                    begin
-                      from_connection.transaction do |fconn|
-                        fconn.exec("SET statement_timeout = 0")
-                        to_connection.exec("TRUNCATE #{table} CASCADE")
-                        to_connection.copy_data "COPY #{table} (#{fields}) FROM STDIN" do
-                          fconn.copy_data "COPY (SELECT #{copy_fields} FROM #{table}#{where}) TO STDOUT" do
-                            while row = fconn.get_copy_data
-                              to_connection.put_copy_data(row)
-                            end
-                          end
+                    to_connection.exec("TRUNCATE #{table} CASCADE")
+                    to_connection.copy_data "COPY #{table} (#{fields}) FROM STDIN" do
+                      from_connection.copy_data "COPY (SELECT #{copy_fields} FROM #{table}#{where}) TO STDOUT" do
+                        while row = from_connection.get_copy_data
+                          to_connection.put_copy_data(row)
                         end
-                        seq_values.each do |seq, value|
-                          to_connection.exec("SELECT setval(#{escape(seq)}, #{escape(value)})")
-                        end
-                        raise PgSync::Rollback
                       end
-                    rescue PgSync::Rollback
-                      # success
+                    end
+                    seq_values.each do |seq, value|
+                      to_connection.exec("SELECT setval(#{escape(seq)}, #{escape(value)})")
                     end
                   end
                 end
@@ -228,6 +219,9 @@ module PgSync
         command = source[2..-2]
         # puts "Running #{command}"
         source = `#{command}`.chomp
+        unless $?.success?
+          abort "Command exited with non-zero status:\n#{command}"
+        end
       end
       source
     end

data/lib/pgsync/version.rb

@@ -1,3 +1,3 @@
 module PgSync
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgsync
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop