pgslice 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5697462268c630c5fd8e72567fe4ac9b903d157
-  data.tar.gz: 686af5d5c45edff42d491f7378f1338299aa6a14
+  metadata.gz: 4e0437c8314b62daec17ddf072a9f269fa6b7aa1
+  data.tar.gz: 311105b8057bc43cf9ff75a7a8be0dc62b707c9b
 SHA512:
-  metadata.gz: e09e05ebe4cad9c34fae30ca04f6c6fe5ff6a1f3bb175ea55af9e29add720e9d6319939dd92be320d3360957c03cc5756862c8ef1918ff2d5277c7c47e315a88
-  data.tar.gz: cac51539b16171d3a54f4a93d3ee4539ae50b34267727fa883614c341693b49894951537fd45e0e4432ba78bbe8e9f21b1d7a932cf0f3f2ab4967b0c2c0ca2c7
+  metadata.gz: 4db509fb649e78d0fac104071e58621b54a01bc5b17b53bbd5aa786ee9908e657ed6adaf6e407ffae28cfc81549cdde76512e4a6b9195a18ac421ac31eb21755
+  data.tar.gz: a43f16632bca4827762396778d3ed23718046f774e584ef65b6a48af8245d195014c4f628a190f9e58c0d534b4bd9b8aaf4dd59d776d4428e9f56afdaacc69ae

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.2.3
+
+- Added `--dest-table` option to `fill`
+- Fixed errors with `fill` when no partitions created
+
 ## 0.2.2
 
 - Set `lock_timeout` on `swap` to prevent bad things from happening

data/lib/pgslice/version.rb

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

data/lib/pgslice.rb

@@ -214,13 +214,14 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
       abort "Usage: pgslice fill <table>" if arguments.length != 1
 
       source_table = options[:source_table]
+      dest_table = options[:dest_table]
 
       if options[:swapped]
         source_table ||= retired_name(table)
-        dest_table = table
+        dest_table ||= table
       else
         source_table ||= table
-        dest_table = intermediate_name(table)
+        dest_table ||= intermediate_name(table)
       end
 
       abort "Table not found: #{source_table}" unless table_exists?(source_table)
@@ -232,17 +233,19 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
         name_format = self.name_format(period)
 
         existing_tables = self.existing_tables(like: "#{table}_%").select { |t| /#{Regexp.escape("#{table}_")}(\d{4,6})/.match(t) }.sort
-        starting_time = DateTime.strptime(existing_tables.first.split("_").last, name_format)
-        ending_time = advance_date(DateTime.strptime(existing_tables.last.split("_").last, name_format), period, 1)
+        if existing_tables.any?
+          starting_time = DateTime.strptime(existing_tables.first.split("_").last, name_format)
+          ending_time = advance_date(DateTime.strptime(existing_tables.last.split("_").last, name_format), period, 1)
+        end
       end
 
       primary_key = self.primary_key(table)
       max_source_id = max_id(source_table, primary_key)
       max_dest_id =
         if options[:swapped]
-          max_id(dest_table, primary_key, below: max_source_id)
+          max_id(dest_table, primary_key, where: options[:where], below: max_source_id)
         else
-          max_id(dest_table, primary_key)
+          max_id(dest_table, primary_key, where: options[:where])
         end
 
       if max_dest_id == 0 && !options[:swapped]
@@ -262,7 +265,7 @@ CREATE OR REPLACE FUNCTION #{trigger_name}()
       batch_count = ((max_source_id - starting_id) / batch_size.to_f).ceil
       while starting_id < max_source_id
         where = "#{primary_key} > #{starting_id} AND #{primary_key} <= #{starting_id + batch_size}"
-        if period
+        if starting_time
           where << " AND #{field} >= #{sql_date(starting_time)} AND #{field} < #{sql_date(ending_time)}"
         end
         if options[:where]
@@ -350,6 +353,7 @@ INSERT INTO #{dest_table} (#{fields})
         o.integer "--start"
         o.string "--url"
         o.string "--source-table"
+        o.string "--dest-table"
         o.string "--where"
         o.string "--lock-timeout", default: "5s"
         o.on "-v", "--version", "print the version" do
@@ -460,9 +464,12 @@ INSERT INTO #{dest_table} (#{fields})
       row && row["attname"]
     end
 
-    def max_id(table, primary_key, below: nil)
+    def max_id(table, primary_key, below: nil, where: nil)
       query = "SELECT MAX(#{primary_key}) FROM #{table}"
-      query << " WHERE #{primary_key} <= #{below}" if below
+      conditions = []
+      conditions << "#{primary_key} <= #{below}" if below
+      conditions << where if where
+      query << " WHERE #{conditions.join(" AND ")}" if conditions.any?
       execute(query)[0]["max"].to_i
     end
 

metadata

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