embulk-input-postgresql 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc9510b0deb36b7e1abb4a547168f9fa7f0b501
-  data.tar.gz: eef2d989d28a9be67496cec87cda66f67f804f63
+  metadata.gz: b9c87767c5c72bf9ad8fb4292916be3daa3c99c7
+  data.tar.gz: a16d44ad3289d71b31a19ddaa543acd980f0d3c8
 SHA512:
-  metadata.gz: 833a8abacabb4b7063e2403bc893fd2eb7e8e2afaf44fbb46f7248f67df1021ea1ffe5677cb988cb63ff897c5500e68d19cfea1360476852c23a2affd34eeb53
-  data.tar.gz: ba8c6bb06b50816c5b6f72df3dd2c3cc629f6519fed2460639f15fcd415dfc269d357648ebcf2ab8dae3fea4f114e30b99a9723687b7ee9a1caba53a36227ff6
+  metadata.gz: 106f08c0ccdac1fe0fd27b4b05a76f900149f94f7d5f66f98df40f4081294e527096c091142309fd7035cf899ba4c48d01605e6596545a191971c1765b17ac7e
+  data.tar.gz: c3e34e3f61e56abeec9d38d2eec1ee1518fcd4d90e64af90e436fdbd708b44e9fe4fd8b76a74c125ad80d3df32e6974c9a06ddcdb13c5800424c804269ca8b9b

data/README.md

@@ -14,8 +14,8 @@ PostgreSQL input plugins for Embulk loads records from 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)
 - **select**: comma-separated list of columns to select (string, default: "*")
 - **where**: WHERE condition to filter the rows (string, default: no-condition)
 - **fetch_rows**: number of rows to fetch one time (used for java.sql.Statement#setFetchSize) (integer, default: 10000)

data/src/main/java/org/embulk/input/PostgreSQLInputPlugin.java

@@ -6,26 +6,57 @@ import java.sql.Driver;
 import java.sql.SQLException;
 import com.google.common.base.Throwables;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
 import org.embulk.input.postgresql.PostgreSQLInputConnection;
 
 public class PostgreSQLInputPlugin
         extends AbstractJdbcInputPlugin
 {
-    private static final String DEFAULT_SCHEMA = "public";
-    private static final int DEFAULT_PORT = 5432;
-
     private static final Driver driver = new org.postgresql.Driver();
 
+    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 PostgreSQLInputConnection newConnection(PluginTask task) throws SQLException
     {
+        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
 
@@ -34,7 +65,7 @@ public class PostgreSQLInputPlugin
         props.setProperty("tcpKeepAlive", "true");
 
         // TODO
-        //switch task.getSssl() {
+        //switch t.getSssl() {
         //when "disable":
         //    break;
         //when "enable":
@@ -44,11 +75,11 @@ public class PostgreSQLInputPlugin
         //    break;
         //}
 
-        props.putAll(task.getOptions());
+        props.putAll(t.getOptions());
 
         Connection con = driver.connect(url, props);
         try {
-            PostgreSQLInputConnection c = new PostgreSQLInputConnection(con, task.getSchema().or(DEFAULT_SCHEMA));
+            PostgreSQLInputConnection c = new PostgreSQLInputConnection(con, t.getSchema());
             con = null;
             return c;
         } finally {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.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: Selects records from a table.
 email:
@@ -22,8 +22,8 @@ files:
 - lib/embulk/input/postgresql.rb
 - src/main/java/org/embulk/input/PostgreSQLInputPlugin.java
 - src/main/java/org/embulk/input/postgresql/PostgreSQLInputConnection.java
-- classpath/embulk-input-jdbc-0.2.3.jar
-- classpath/embulk-input-postgresql-0.2.3.jar
+- classpath/embulk-input-jdbc-0.3.0.jar
+- classpath/embulk-input-postgresql-0.3.0.jar
 - classpath/jna-4.1.0.jar
 - classpath/jna-platform-4.1.0.jar
 - classpath/postgresql-9.4-1200-jdbc41.jar