embulk-output-redshift 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f739710245a2663409cf49beb31c8e18cb148684
-  data.tar.gz: fe5268568d22eed5d8fc40e9117684ba5989a715
+  metadata.gz: d9ca4eb2942aae5f463bf611914d8cf76393ab7d
+  data.tar.gz: f65aa7a7ee215d13437567609be6233ed538f2dd
 SHA512:
-  metadata.gz: 9d8808f711394ed62b840faa26d1472f871e7c7e71b069b9279a5342b1580b9d496c8d1103984f97e942a715d16f91bd402a2baed03c3dc68625d0727761064b
-  data.tar.gz: a65ba3a389a4f3e80cc179c18d5ed0d8e0e62a550776dd73b0888ae4b2832ccd96f9b3e680d202723ab667d4104aaa62af25dc7e9e51699634dc767d0f578701
+  metadata.gz: c0f0fc9b9270cff6e50456594bd41ea87b4e5f89f55faf0709dbc40263ebdf63497528174e759b901dfab7ad6e5bf024a84abf91472274cddbe691cbfe5bdba5
+  data.tar.gz: 136189a5e9b844cc5c9a8bb87a39e176a69db3544ee717735bbfd7e1190bba03bc4aa5c1df5cd7841457f7a07728b3f101af807cc196b93374b6bcaed27bfdbb

data/README.md

@@ -20,12 +20,12 @@ Redshift output plugins for Embulk loads records to Redshift.
 - **options**: extra connection properties (hash, default: {})
 - **mode**: "replace" or "insert" (string, required)
 - **batch_size**: size of a single batch insert (integer, default: 16777216)
-- **default_timezone**: If input column type (embulk type) is timestamp and destination column type is `string` or `nstring`, this plugin needs to format the timestamp into a string. This default_timezone option is used to control the timezone. You can overwrite timezone for each columns using column_options option. (string, default: `UTC`)
+- **default_timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp into a SQL string. This default_timezone option is used to control the 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.
   - **type**: type of a column when this plugin creates new tables (e.g. `VARCHAR(255)`, `INTEGER NOT NULL UNIQUE`). This used when this plugin creates intermediate tables (insert, truncate_insert and merge modes), when it creates the target table (insert_direct and replace modes), and when it creates nonexistent target table automatically. (string, default: depends on input column type. `BIGINT` if input column type is long, `BOOLEAN` if boolean, `DOUBLE PRECISION` if double, `CLOB` if string, `TIMESTAMP` if timestamp)
   - **value_type**: This plugin converts input column type (embulk type) into a database type to build a INSERT statement. This value_type option controls the type of the value in a INSERT statement. (string, default: depends on input column type. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `null`, `pass`)
   - **timestamp_format**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. This timestamp_format option is used to control the format of the timestamp. (string, default: `%Y-%m-%d %H:%M:%S.%6N`)
-  - **timezone**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. And if the input column type is timestamp and value_type is `date`, this plugin needs to consider timezone. In those cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
+  - **timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp value into a SQL string. In this cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
 
 ### Modes
 
@@ -42,7 +42,7 @@ Redshift output plugins for Embulk loads records to Redshift.
   * Transactional: Yes.
   * Resumable: Yes.
 * **merge**:
-  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, runs `INSERT INTO <target_table> SELECT * FROM <intermediate_table_1> UNION ALL SELECT * FROM <intermediate_table_2> UNION ALL ... ON DUPLICATE KEY UPDATE ...` query.
+  * Behavior: This mode writes rows to some intermediate tables first. If all those tasks run correctly, runs `with updated AS (UPDATE .... RETURNING ...) INSERT INTO ....` query.
   * Transactional: Yes.
   * Resumable: Yes.
 * **replace**:

data/src/main/java/org/embulk/output/redshift/RedshiftCopyBatchInsert.java

@@ -44,7 +44,7 @@ public class RedshiftCopyBatchInsert
     private long totalRows;
     private int fileCount;
 
-    public static final String COPY_AFTER_FROM = "GZIP DELIMITER '\\t' NULL '\\N' ESCAPE TRUNCATECOLUMNS ACCEPTINVCHARS STATUPDATE OFF COMPUPDATE OFF";
+    public static final String COPY_AFTER_FROM = "GZIP DELIMITER '\\t' NULL '\\\\N' ESCAPE TRUNCATECOLUMNS ACCEPTINVCHARS STATUPDATE OFF COMPUPDATE OFF";
 
     public RedshiftCopyBatchInsert(RedshiftOutputConnector connector,
             AWSCredentialsProvider credentialsProvider, String s3BucketName,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-redshift
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -30,13 +30,14 @@ files:
 - classpath/aws-java-sdk-sts-1.9.17.jar
 - classpath/commons-codec-1.6.jar
 - classpath/commons-logging-1.1.3.jar
-- classpath/embulk-output-jdbc-0.3.0.jar
-- classpath/embulk-output-postgresql-0.3.0.jar
-- classpath/embulk-output-redshift-0.3.0.jar
+- classpath/embulk-output-jdbc-0.4.0.jar
+- classpath/embulk-output-postgresql-0.4.0.jar
+- classpath/embulk-output-redshift-0.4.0.jar
 - classpath/httpclient-4.3.4.jar
 - classpath/httpcore-4.3.2.jar
 - classpath/jna-4.1.0.jar
 - classpath/jna-platform-4.1.0.jar
+- classpath/joda-time-2.8.jar
 - classpath/postgresql-9.4-1200-jdbc41.jar
 - classpath/slf4j-simple-1.7.7.jar
 - classpath/waffle-jna-1.7.jar