embulk-output-postgresql 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe3e2f7575aeaba99a68a92d9b61827567dbd154
-  data.tar.gz: a73b783354cadd02577bdf61e95623e7875a8c55
+  metadata.gz: 44ed8f4fbfa78610945b3a91df855c01aee5eb14
+  data.tar.gz: f096069f258e0af4f594bdacb50e856531603bbc
 SHA512:
-  metadata.gz: 02e7fab361427e5cbb296b334ffe5957432fad1f27016cd0de3630c239a88cb1451a6d4dbbe83dce41aeb02e4baeee2d10ce18f6f8b1273c6ce5461208b65d30
-  data.tar.gz: 7c2299aa7d5861474a3b2580d01560c94d3aa42aa55a8b0b762dab548db8e03ebbc3172a955ce5cd0e07c44213e81afbdd1dfd5a417176ab2205e6aaac46eb18
+  metadata.gz: 55d89c919eca26b1dea9d751ecd12d7fae11dc45705a870e970d39b686f8f0f51c7c8e53b20be29adf9b8ab230d73701908c0b4e2d2d6be732a27f52738db21d
+  data.tar.gz: 6c976a45528ead54877092bbe39a568ef35e29e8e1209959861ae2b587f6212e22b9ea031bcf504bd62a74fc17c5fb787edd7739e73698ab914f0e12d03932f4

data/README.md

@@ -17,8 +17,8 @@ PostgreSQL output plugins for Embulk loads records to PostgreSQL.
 - **user**: database login user name (string, required)
 - **password**: database login password (string, default: "")
 - **database**: destination database name (string, required)
-- **schema**: destination name (string, default: "public")
-- **table**: destination name (string, required)
+- **schema**: destination schema name (string, default: "public")
+- **table**: destination table name (string, required)
 - **mode**: "replace" or "insert" (string, required)
 - **batch_size**: size of a single batch insert (integer, default: 16777216)
 - **options**: extra connection properties (hash, default: {})

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

@@ -4,6 +4,8 @@ import java.util.Properties;
 import java.io.IOException;
 import java.sql.SQLException;
 import org.embulk.spi.Exec;
+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;
@@ -12,18 +14,48 @@ import org.embulk.output.postgresql.PostgreSQLCopyBatchInsert;
 public class PostgreSQLOutputPlugin
         extends AbstractJdbcOutputPlugin
 {
-    private static final String DEFAULT_SCHEMA = "public";
-    private static final int DEFAULT_PORT = 5432;
+    public interface PostgreSQLPluginTask
+            extends PluginTask
+    {
+        @Config("host")
+        public String getHost();
+
+        @Config("port")
+        @ConfigDefault("5432")
+        public int getPort();
+
+        @Config("user")
+        public String getUser();
+
+        @Config("password")
+        @ConfigDefault("\"\"")
+        public String getPassword();
+
+        @Config("database")
+        public String getDatabase();
+
+        @Config("schema")
+        @ConfigDefault("\"public\"")
+        public String getSchema();
+    }
+
+    @Override
+    protected Class<? extends PluginTask> getTaskClass()
+    {
+        return PostgreSQLPluginTask.class;
+    }
 
     @Override
     protected PostgreSQLOutputConnector getConnector(PluginTask task, boolean retryableMetadataOperation)
     {
+        PostgreSQLPluginTask t = (PostgreSQLPluginTask) task;
+
         String url = String.format("jdbc:postgresql://%s:%d/%s",
-                task.getHost(), task.getPort().or(DEFAULT_PORT), task.getDatabase());
+                t.getHost(), t.getPort(), t.getDatabase());
 
         Properties props = new Properties();
-        props.setProperty("user", task.getUser());
-        props.setProperty("password", task.getPassword());
+        props.setProperty("user", t.getUser());
+        props.setProperty("password", t.getPassword());
         props.setProperty("loginTimeout",   "300"); // seconds
         props.setProperty("socketTimeout", "1800"); // seconds
 
@@ -32,7 +64,7 @@ public class PostgreSQLOutputPlugin
         props.setProperty("tcpKeepAlive", "true");
 
         // TODO
-        //switch task.getSssl() {
+        //switch t.getSssl() {
         //when "disable":
         //    break;
         //when "enable":
@@ -48,9 +80,9 @@ public class PostgreSQLOutputPlugin
             props.setProperty("socketTimeout", "28800");  // seconds
         }
 
-        props.putAll(task.getOptions());
+        props.putAll(t.getOptions());
 
-        return new PostgreSQLOutputConnector(url, props, task.getSchema().or(DEFAULT_SCHEMA));
+        return new PostgreSQLOutputConnector(url, props, t.getSchema());
     }
 
     @Override

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -25,8 +25,8 @@ 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.1.2.jar
-- classpath/embulk-output-postgresql-0.1.2.jar
+- classpath/embulk-output-jdbc-0.2.0.jar
+- classpath/embulk-output-postgresql-0.2.0.jar
 - classpath/jna-4.1.0.jar
 - classpath/jna-platform-4.1.0.jar
 - classpath/postgresql-9.4-1200-jdbc41.jar