pgslice 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e344dce1fde075ab0621622d3f929e2c6677026
-  data.tar.gz: 9fe6e7825852fb37692ff019908dfb82e5cf4095
+  metadata.gz: c5697462268c630c5fd8e72567fe4ac9b903d157
+  data.tar.gz: 686af5d5c45edff42d491f7378f1338299aa6a14
 SHA512:
-  metadata.gz: a684bbbbc65be40c4a42850f0b54af657371649efef72f9f89337a8fae4ac046bd1fe758f1632ff2fc15c3a3d1e2c6feec7f2eaa70e13d9f815565993ff0e85a
-  data.tar.gz: 6b5e6fe5958f81085c8ec9a3d0d0161e35aa29f616b2db32dca993b520e14178face97dbe43133dc919b750b24a220cfe5819cd1732f6c64307cf81f6ee22363
+  metadata.gz: e09e05ebe4cad9c34fae30ca04f6c6fe5ff6a1f3bb175ea55af9e29add720e9d6319939dd92be320d3360957c03cc5756862c8ef1918ff2d5277c7c47e315a88
+  data.tar.gz: cac51539b16171d3a54f4a93d3ee4539ae50b34267727fa883614c341693b49894951537fd45e0e4432ba78bbe8e9f21b1d7a932cf0f3f2ab4967b0c2c0ca2c7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.2
+
+- Set `lock_timeout` on `swap` to prevent bad things from happening
+- Friendlier error messages
+
 ## 0.2.1
 
 - Added `--where` option to `fill`

data/README.md

@@ -182,6 +182,8 @@ pgslice swap visits
 ```sql
 BEGIN;
 
+SET LOCAL lock_timeout = '5s';
+
 ALTER TABLE visits RENAME TO visits_retired;
 
 ALTER TABLE visits_intermediate RENAME TO visits;

data/lib/pgslice.rb

@@ -249,7 +249,7 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
         if options[:start]
           max_dest_id = options[:start]
         else
-          min_source_id = min_id(source_table, primary_key, field, starting_time)
+          min_source_id = min_id(source_table, primary_key, field, starting_time, options[:where])
           max_dest_id = min_source_id - 1 if min_source_id
         end
       end
@@ -308,6 +308,8 @@ INSERT INTO #{dest_table} (#{fields})
         queries << "ALTER SEQUENCE #{sequence["sequence_name"]} OWNED BY #{table}.#{sequence["related_column"]};"
       end
 
+      queries.unshift("SET LOCAL lock_timeout = '#{options[:lock_timeout]}';") if server_version_num >= 90300
+
       run_queries(queries)
     end
 
@@ -349,6 +351,7 @@ INSERT INTO #{dest_table} (#{fields})
         o.string "--url"
         o.string "--source-table"
         o.string "--where"
+        o.string "--lock-timeout", default: "5s"
         o.on "-v", "--version", "print the version" do
           log PgSlice::VERSION
           @exit = true
@@ -401,18 +404,28 @@ INSERT INTO #{dest_table} (#{fields})
 
     def run_queries(queries)
       connection.transaction do
-        execute("SET client_min_messages TO warning") unless options[:dry_run]
+        execute("SET LOCAL client_min_messages TO warning") unless options[:dry_run]
         log_sql "BEGIN;"
         log_sql
         queries.each do |query|
           log_sql query
           log_sql
-          execute(query) unless options[:dry_run]
+          unless options[:dry_run]
+            begin
+              execute(query)
+            rescue PG::ServerError => e
+              abort("#{e.class.name}: #{e.message}")
+            end
+          end
         end
         log_sql "COMMIT;"
       end
     end
 
+    def server_version_num
+      execute("SHOW server_version_num")[0]["server_version_num"].to_i
+    end
+
     def existing_tables(like:)
       query = "SELECT tablename FROM pg_catalog.pg_tables WHERE schemaname = $1 AND tablename LIKE $2"
       execute(query, ["public", like]).map { |r| r["tablename"] }.sort
@@ -453,9 +466,12 @@ INSERT INTO #{dest_table} (#{fields})
       execute(query)[0]["max"].to_i
     end
 
-    def min_id(table, primary_key, column, starting_time)
+    def min_id(table, primary_key, column, starting_time, where)
       query = "SELECT MIN(#{primary_key}) FROM #{table}"
-      query << " WHERE #{column} >= #{sql_date(starting_time)}" if starting_time
+      conditions = []
+      conditions << "#{column} >= #{sql_date(starting_time)}" if starting_time
+      conditions << where if where
+      query << " WHERE #{conditions.join(" AND ")}" if conditions.any?
       (execute(query)[0]["min"] || 1).to_i
     end
 

data/lib/pgslice/version.rb

@@ -1,3 +1,3 @@
 module PgSlice
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgslice
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop