embulk-output-postgresql 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d05d56998c2cc70e2ce2a10c1a969bdf13cc4f8f
-  data.tar.gz: d37398c5cf2300bb969b76f077dac69f2e1da1cc
+  metadata.gz: e06631517e53bd9848c6e4e1f97761bb9a3ada58
+  data.tar.gz: 4bace143eab94cf52ff3614854047164eb920426
 SHA512:
-  metadata.gz: a758f7c148693480bd4f3a38858ff9c2070021ac36eb69da3b7361c9844568612f6d180350016e4ba834267d7a59144a6a78f7507096fd8b612e65f651763fbe
-  data.tar.gz: c874cad1f3e99f1f9e4787e14a6c72905336328da2c690615bdad9dd43ec8df26a494e447ffb462143d490e4caf5a8fef2c6a5f0aa97cf07c6a275685e68d6f0
+  metadata.gz: a77908380e0e8f5babdcf2afcc73d2663e4d743f4c579b27b765b045da571587ddf011ea377ad1319987ca99f03b23d07eb01d359b73bd7d37d0d6e4949863e7
+  data.tar.gz: 558bf4aa7e15fbde87ebadbf343c67915eddd5846f5703cf579c81192b11ceadea8d46281d33e1bc5eac91b739ce643956374c117c69701caa38a027af99a059

data/README.md

@@ -25,7 +25,7 @@ PostgreSQL output plugins for Embulk loads records to PostgreSQL.
 - **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 WITH TIME ZONE` 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`)
+  - **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 the sql type of the column. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `json`, `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, 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)
 
@@ -52,6 +52,29 @@ PostgreSQL output plugins for Embulk loads records to PostgreSQL.
   * Transactional: Yes.
   * Resumable: Yes.
 
+### Supported types
+
+|database type|default value_type|note|
+|:--|:--|:--|
+|bool|boolean||
+|smallint|short||
+|int|int||
+|bigint|long||
+|real|float||
+|double precision|double||
+|money|double||
+|numeric|decimal||
+|char|string||
+|varchar|string||
+|text|string||
+|json|json||
+|jsonb|json||
+|date|date||
+|time|time||
+|timestamp|timestamp||
+
+You can use other types by specifying `value_type` in `column_options`.
+
 ### Example
 
 ```yaml

data/src/main/java/org/embulk/output/PostgreSQLOutputPlugin.java

@@ -1,25 +1,29 @@
 package org.embulk.output;
 
-import java.util.List;
-import java.util.Properties;
 import java.io.IOException;
 import java.sql.SQLException;
-import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableSet;
+import java.sql.Types;
+import java.util.List;
+import java.util.Properties;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
 import org.embulk.output.jdbc.BatchInsert;
-import org.embulk.output.postgresql.PostgreSQLOutputConnector;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcSchema;
+import org.embulk.output.jdbc.setter.ColumnSetterFactory;
 import org.embulk.output.postgresql.PostgreSQLCopyBatchInsert;
+import org.embulk.output.postgresql.PostgreSQLOutputConnector;
+import org.embulk.output.postgresql.setter.PostgreSQLColumnSetterFactory;
+import org.embulk.spi.Column;
+import org.embulk.spi.ColumnVisitor;
+import org.embulk.spi.Schema;
+import org.joda.time.DateTimeZone;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
-import java.sql.Types;
-import org.embulk.spi.Schema;
-import org.embulk.spi.ColumnVisitor;
-import org.embulk.spi.Column;
-import org.embulk.output.jdbc.JdbcColumn;
-import org.embulk.output.jdbc.JdbcSchema;
+import com.google.common.collect.ImmutableSet;
 
 public class PostgreSQLOutputPlugin
         extends AbstractJdbcOutputPlugin
@@ -155,7 +159,9 @@ public class PostgreSQLOutputPlugin
 
                 public void jsonColumn(Column column)
                 {
-                    throw new UnsupportedOperationException("This plugin doesn't support json type. Please try to upgrade version of the plugin using 'embulk gem update' command. If the latest version still doesn't support json type, please contact plugin developers, or change configuration of input plugin not to use json type.");
+                    columns.add(JdbcColumn.newGenericTypeColumn(
+                            columnName, Types.OTHER, "JSON",
+                            4000, 0, false, false));  // TODO size type param
                 }
 
                 public void timestampColumn(Column column)
@@ -168,4 +174,10 @@ public class PostgreSQLOutputPlugin
         }
         return new JdbcSchema(columns.build());
     }
+
+    @Override
+    protected ColumnSetterFactory newColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    {
+        return new PostgreSQLColumnSetterFactory(batch, defaultTimeZone);
+    }
 }

data/src/main/java/org/embulk/output/postgresql/setter/PostgreSQLColumnSetterFactory.java

@@ -0,0 +1,30 @@
+package org.embulk.output.postgresql.setter;
+
+import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.JdbcColumnOption;
+import org.embulk.output.jdbc.setter.ColumnSetter;
+import org.embulk.output.jdbc.setter.ColumnSetterFactory;
+import org.embulk.output.jdbc.setter.JsonColumnSetter;
+import org.joda.time.DateTimeZone;
+
+public class PostgreSQLColumnSetterFactory
+        extends ColumnSetterFactory
+{
+    public PostgreSQLColumnSetterFactory(BatchInsert batch, DateTimeZone defaultTimeZone)
+    {
+        super(batch, defaultTimeZone);
+    }
+
+    @Override
+    public ColumnSetter newCoalesceColumnSetter(JdbcColumn column, JdbcColumnOption option)
+    {
+        if (column.getSimpleTypeName().equalsIgnoreCase("json") || column.getSimpleTypeName().equalsIgnoreCase("jsonb")) {
+            // actually "JSON"/"JSONB"
+            return new JsonColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        } else {
+            return super.newCoalesceColumnSetter(column, option);
+        }
+    }
+
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -25,8 +25,9 @@ files:
 - src/main/java/org/embulk/output/postgresql/PostgreSQLCopyBatchInsert.java
 - src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnection.java
 - src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java
-- classpath/embulk-output-jdbc-0.5.1.jar
-- classpath/embulk-output-postgresql-0.5.1.jar
+- src/main/java/org/embulk/output/postgresql/setter/PostgreSQLColumnSetterFactory.java
+- classpath/embulk-output-jdbc-0.6.0.jar
+- classpath/embulk-output-postgresql-0.6.0.jar
 - classpath/postgresql-9.4-1205-jdbc41.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses: