embulk-input-postgresql 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: edb5cbc6680e6fdd62506d5274f43ae0fa95e89d
-  data.tar.gz: a961032ae6f7add861fcd88760fc8bbe9f09fe05
+SHA256:
+  metadata.gz: 0f1e541f85bd0a140c29d03b8ea6faa9e19f57615a6a247bf56e29157674c812
+  data.tar.gz: 26f6756d61b5cd06e26246571dfa8993c5cdaba23e0bc3c1e9a5c2f7585e2810
 SHA512:
-  metadata.gz: ece1c87b6a0b05919ba2054cdcdb8a10f59c3b4e4d9b6c6a1fb689f3964bfae1f013d5d0e17d8a453f1c49f7fe6a80218bfdb0bc2c19fd976a388cc517fb62cf
-  data.tar.gz: b0a055403e5a383316f4a39caee43fa24fd70207aa24a950779dfe3f08182e2d95e86a635057cc561b890626fd5d099603120fad0ae5bd308b80f3754c3c2e0b
+  metadata.gz: b519fb0d9d2404887bc310c9d82abb911d4aa0f76b22ea13e2465ee68fca6ac078278e73706b949de589d4f6e22bdd4fb0ccb5ace0be603bc7601015da59f8d7
+  data.tar.gz: 36608aff9877cf1e838642742570ddb9d31fd2007d1c7bece49186ff1e229cc68d00873733afab7c2734769492a3abbca1d973472d7e4b87fca65174d4bc0d32

data/README.md

@@ -34,7 +34,8 @@ PostgreSQL input plugin for Embulk loads records from PostgreSQL.
 - **incremental_columns**: column names for incremental loading (array of strings, default: use primary keys)
 - **last_record**: values of the last record for incremental loading (array of objects, default: load all records)
 - **default_timezone**: If the sql type of a column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted int this default_timezone. You can overwrite timezone for each columns using column_options option. (string, default: `UTC`)
-- **column_options**: advanced: a key-value pairs where key is a column name and value is options for the column.
+- **default_column_options**: advanced: column_options for each JDBC type as default. key-value pairs where key is a JDBC type (e.g. 'DATE', 'BIGINT') and value is same as column_options's value.
+- **column_options**: advanced: key-value pairs where key is a column name and value is options for the column.
   - **value_type**: embulk get values from database as this value_type. Typically, the value_type determines `getXXX` method of `java.sql.PreparedStatement`.
   (string, default: depends on the sql type of the column. Available values options are: `long`, `double`, `float`, `decimal`, `boolean`, `string`, `json`, `date`, `time`, `timestamp`, `array`)
   See below for `hstore` column.
@@ -45,6 +46,8 @@ PostgreSQL input plugin for Embulk loads records from PostgreSQL.
   - **timestamp_format**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted by this timestamp_format. And if the embulk type is `timestamp`, this timestamp_format may be used in the output plugin. For example, stdout plugin use the timestamp_format, but *csv formatter plugin doesn't use*. (string, default : `%Y-%m-%d` for `date`, `%H:%M:%S` for `time`, `%Y-%m-%d %H:%M:%S` for `timestamp`)
   - **timezone**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted in this timezone.
 (string, value of default_timezone option is used by default)
+- **before_setup**: if set, this SQL will be executed before setup. You can prepare table for input by this option.
+- **before_select**: if set, this SQL will be executed before the SELECT query in the same transaction.
 - **after_select**: if set, this SQL will be executed after the SELECT query in the same transaction.
 
 ### hstore column support
@@ -113,7 +116,7 @@ Then, it updates `last_record: ` so that next execution uses the updated last_re
 CREATE INDEX embulk_incremental_loading_index ON table (updated_at, id);
 ```
 
-Recommended usage is to leave `incremental_columns` unset and let this plugin automatically finds an auto-increment (serial / bigserial) primary key. Currently, only strings and integers are supported as incremental_columns.
+Recommended usage is to leave `incremental_columns` unset and let this plugin automatically finds an auto-increment (serial / bigserial) primary key. Currently, only strings, integers, TIMESTAMP and TIMESTAMPTZ are supported as incremental_columns.
 
 ### Use incremental loading with raw query
 
@@ -200,6 +203,9 @@ in:
   table: "my_table"
   select: "col1, col2, col3"
   where: "col4 != 'a'"
+  default_column_options:
+    TIMESTAMP: { type: string, timestamp_format: "%Y/%m/%d %H:%M:%S", timezone: "+0900"}
+    BIGINT: { type: string }
   column_options:
     col1: {type: long}
     col3: {type: string, timestamp_format: "%Y/%m/%d", timezone: "+0900"}

data/build.gradle

@@ -4,5 +4,5 @@ dependencies {
     compile 'org.postgresql:postgresql:9.4-1205-jdbc41'
     defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41'
 
-    testCompile 'org.embulk:embulk-standards:0.8.15'
+    testCompile 'org.embulk:embulk-standards:0.9.12'
 }

data/src/main/java/org/embulk/input/postgresql/getter/ArrayColumnGetter.java

@@ -155,7 +155,9 @@ public class ArrayColumnGetter
             }
             builder.append(",");
         }
-        builder.deleteCharAt(builder.length() - 1);
+        if (values.length > 0) {
+            builder.deleteCharAt(builder.length() - 1);
+        }
         builder.append("}");
     }
 

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/expected_json.csv

@@ -1,3 +1,4 @@
 "[1000,2000,3000,4000]","[[""red"",""green""],[""blue"",""cyan""]]",[[[true]]],[1.23456789E9]
 "[5000,6000,7000,8000]","[[""yellow"",""magenta""],[""purple"",""light,dark""]]","[[[true,true],[false,false]],[[true,false],[false,true]]]",[1.2345678901234567E19]
 [1000],"[[""\"""",""{\\}"",""{a,b}""]]",[true],[1.2345678901234567E19]
+[],[],[],[]

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/expected_string.csv

@@ -1,3 +1,4 @@
 "{1000,2000,3000,4000}","{{red,green},{blue,cyan}}",{{{t}}},{1234567890}
 "{5000,6000,7000,8000}","{{yellow,magenta},{purple,""light,dark""}}","{{{t,t},{f,f}},{{t,f},{f,t}}}",{12345678901234567890}
 {1000},"{{""\"""",""{\\}"",""{a,b}""}}",{t},{12345678901234567890.1234567890}
+{},{},{},{}

data/src/test/resources/org/embulk/input/postgresql/test/expect/array/setup.sql

@@ -12,3 +12,5 @@ insert into input_array (c1, c2, c3, c4) values ('{1000, 2000, 3000, 4000}', '{{
 insert into input_array (c1, c2, c3, c4) values ('{5000, 6000, 7000, 8000}', '{{"yellow", "magenta"}, {"purple", "light,dark"}}', '{{{t,t},{f,f}},{{t,f},{f,t}}}', '{12345678901234567890}');
 
 insert into input_array (c1, c2, c3, c4) values ('{1000}', '{{"\"", "{\\}", "{a,b}"}}', '{true}', '{12345678901234567890.1234567890}');
+
+insert into input_array (c1, c2, c3, c4) values ('{}', '{}', '{}', '{}');

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.9.3.jar
-- classpath/embulk-input-postgresql-0.9.3.jar
+- classpath/embulk-input-jdbc-0.10.0.jar
+- classpath/embulk-input-postgresql-0.10.0.jar
 - default_jdbc_driver/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: JDBC input plugin for Embulk