embulk-output-postgresql 0.7.12 → 0.7.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29efdbb543b08496679fb29e12ae77b35f4f1d94
-  data.tar.gz: dc4089fb5739238d7a470deafb9982ffa5e926e8
+  metadata.gz: 9db342e9dcc2fd4352de1de73c59036f279f43cd
+  data.tar.gz: 0fa9050578f3cef664a324810b27054aa190e78b
 SHA512:
-  metadata.gz: dccd56ad0416eaafc1042a0614b2ec5dafd9dea01b39e9b4fba4b0f2cbdb0c36a7b36f3bd6a27952856c4f237de6d1a25835a0db40468c7e6186214e20e78a00
-  data.tar.gz: ce54e5533673dfec54a4586dc77de74fb5bc655cb049ef072544fedc257089fd30aa43dab56d12679df075b52273e895d9590b99da237e203555094ad09ea7eb
+  metadata.gz: 633d0743891e46768b60699e1ea346e4b5de288076c7b2b148b57039c2264edbec27e2e1706a5ed54e5aac78084c525d9c7c142d0159964ae731e940914e1ccb
+  data.tar.gz: 1133ad94178b49258423481ead37404a6f49d8c871aeaca4c9d40d283b143c3c14253ab4620f16e833042f273cc89f53231bd441349b4d9032ebfb4354e8172c

data/README.md

@@ -10,6 +10,7 @@ PostgreSQL output plugin for Embulk loads records to PostgreSQL.
 
 ## Configuration
 
+- **driver_path**: path to the jar file of the PostgreSQL JDBC driver. If not set, the bundled JDBC driver (PostgreSQL JDBC Driver 9.4-1205) will be used. (string)
 - **host**: database host name (string, required)
 - **port**: database port number (integer, default: 5432)
 - **user**: database login user name (string, required)
@@ -18,6 +19,8 @@ PostgreSQL output plugin for Embulk loads records to PostgreSQL.
 - **schema**: destination schema name (string, default: "public")
 - **temp_schema**: schema name for intermediate tables. by default, intermediate tables will be created in the schema specified by `schema`. replace mode doesn't support temp_schema. (string, optional)
 - **table**: destination table name (string, required)
+- **create_table_constraint** table constraint added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
+- **create_table_option** table option added to `CREATE TABLE` statement, like `CREATE TABLE <table_name> (<column1> <type1>, <column2> <type2>, ..., <create_table_constraint>) <create_table_option>`.
 - **options**: extra connection properties (hash, default: {})
 - **retry_limit** max retry count for database operations (integer, default: 12)
 - **retry_wait** initial retry wait time in milliseconds (integer, default: 1000 (1 second))

data/build.gradle

@@ -2,6 +2,7 @@ dependencies {
     compile project(':embulk-output-jdbc')
 
     compile 'org.postgresql:postgresql:9.4-1205-jdbc41'
+    defaultJdbcDriver 'org.postgresql:postgresql:9.4-1205-jdbc41'
 
     testCompile project(':embulk-output-jdbc').sourceSets.test.output
 }

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

@@ -27,6 +27,10 @@ public class PostgreSQLOutputPlugin
     public interface PostgreSQLPluginTask
             extends PluginTask
     {
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
+
         @Config("host")
         public String getHost();
 
@@ -67,7 +71,7 @@ public class PostgreSQLOutputPlugin
     protected Features getFeatures(PluginTask task)
     {
         return new Features()
-            .setMaxTableNameLength(30)
+            .setMaxTableNameLength(63)
             .setSupportedModes(ImmutableSet.of(Mode.INSERT, Mode.INSERT_DIRECT, Mode.MERGE, Mode.MERGE_DIRECT, Mode.TRUNCATE_INSERT, Mode.REPLACE))
             .setIgnoreMergeKeys(false);
     }
@@ -77,6 +81,8 @@ public class PostgreSQLOutputPlugin
     {
         PostgreSQLPluginTask t = (PostgreSQLPluginTask) task;
 
+        loadDriver("org.postgresql.Driver", t.getDriverPath());
+
         String url = String.format("jdbc:postgresql://%s:%d/%s",
                 t.getHost(), t.getPort(), t.getDatabase());
 

data/src/main/java/org/embulk/output/postgresql/PostgreSQLOutputConnector.java

@@ -1,16 +1,15 @@
 package org.embulk.output.postgresql;
 
 import java.util.Properties;
-import java.sql.Driver;
 import java.sql.Connection;
+import java.sql.DriverManager;
 import java.sql.SQLException;
+
 import org.embulk.output.jdbc.JdbcOutputConnector;
 
 public class PostgreSQLOutputConnector
         implements JdbcOutputConnector
 {
-    private static final Driver driver = new org.postgresql.Driver();
-
     private final String url;
     private final Properties properties;
     private final String schemaName;
@@ -25,7 +24,7 @@ public class PostgreSQLOutputConnector
     @Override
     public PostgreSQLOutputConnection connect(boolean autoCommit) throws SQLException
     {
-        Connection c = driver.connect(url, properties);
+        Connection c = DriverManager.getConnection(url, properties);
         try {
             PostgreSQLOutputConnection con = new PostgreSQLOutputConnection(c, schemaName, autoCommit);
             c = null;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.7.12
+  version: 0.7.13
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-24 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,9 +19,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.12.jar
-- classpath/embulk-output-postgresql-0.7.12.jar
-- classpath/postgresql-9.4-1205-jdbc41.jar
+- classpath/embulk-output-jdbc-0.7.13.jar
+- classpath/embulk-output-postgresql-0.7.13.jar
+- default_jdbc_driver/postgresql-9.4-1205-jdbc41.jar
 - lib/embulk/output/postgresql.rb
 - src/main/java/org/embulk/output/PostgreSQLOutputPlugin.java
 - src/main/java/org/embulk/output/postgresql/AbstractPostgreSQLCopyBatchInsert.java