embulk-input-postgresql 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad82d4d16fa9bf71b1be8622ded6302988b4131
-  data.tar.gz: 914aa9860e0c3bd21d1cd29049efde0654603ab2
+  metadata.gz: 7fb030ef14fd1af1463a2b3b3cdd83bf512c1c7d
+  data.tar.gz: 37457bed77da7e3af7186587e940186bbb2e56e7
 SHA512:
-  metadata.gz: 930e786df74790257795ca6b54b90e46dc48bdc19da8762ea48947e3c5734d63a55c577c28aed7a98689bb0ee390005b8e3d1f1b835af97c10f0ff3b4c97ac65
-  data.tar.gz: 6007e52be0adab347502bffc569b55ec3cbe63f29a71097ffd4981c72ab41c2827e2d2e0d419f4ffe08497b1de8e3b366ed3679667c5edd5f968755732722a7e
+  metadata.gz: 240f99990ea0af0d82f7ef2299643d4cafe32a47fbdf3cacc88e3b1f6d2476d74a8042a4a78b88c3b6bb33a45ceb7a397dd1a6eb1d0284454bd55476f4fcd731
+  data.tar.gz: 630d0aa5ad64dbb9954cee5cd52567d2451be1d02a2665fd7d24264098d5fc47b38deb6f691513b5ab077be44e487996a6eef29aecd5d98bdb31d990cf6a4483

data/README.md

@@ -16,6 +16,9 @@ PostgreSQL input plugins for Embulk loads records from PostgreSQL.
 - **database**: destination database name (string, required)
 - **schema**: destination schema name (string, default: "public")
 - **fetch_rows**: number of rows to fetch one time (used for java.sql.Statement#setFetchSize) (integer, default: 10000)
+- **connect_timeout**: timeout for establishment of a database connection. (integer (seconds), default: 300)
+- **socket_timeout**: timeout for socket read operations. 0 means no timeout. (integer (seconds), default: 1800)
+- **ssl**: enables SSL. data will be encrypted but CA or certification will not be verified (boolean, default: false)
 - **options**: extra JDBC properties (hash, default: {})
 - If you write SQL directly,
   - **query**: SQL to run (string)

data/build.gradle

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

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

@@ -4,7 +4,6 @@ import java.util.Properties;
 import java.sql.Connection;
 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;
@@ -38,6 +37,10 @@ public class PostgreSQLInputPlugin
         @Config("schema")
         @ConfigDefault("\"public\"")
         public String getSchema();
+
+        @Config("ssl")
+        @ConfigDefault("false")
+        public boolean getSsl();
     }
 
     @Override
@@ -57,23 +60,20 @@ public class PostgreSQLInputPlugin
         Properties props = new Properties();
         props.setProperty("user", t.getUser());
         props.setProperty("password", t.getPassword());
-        props.setProperty("loginTimeout",   "300"); // seconds
-        props.setProperty("socketTimeout", "1800"); // seconds
+        props.setProperty("loginTimeout", String.valueOf(t.getConnectTimeout())); // seconds
+        props.setProperty("socketTimeout", String.valueOf(t.getSocketTimeout())); // seconds
 
         // Enable keepalive based on tcp_keepalive_time, tcp_keepalive_intvl and tcp_keepalive_probes kernel parameters.
         // Socket options TCP_KEEPCNT, TCP_KEEPIDLE, and TCP_KEEPINTVL are not configurable.
         props.setProperty("tcpKeepAlive", "true");
 
-        // TODO
-        //switch t.getSssl() {
-        //when "disable":
-        //    break;
-        //when "enable":
-        //    props.setProperty("sslfactory", "org.postgresql.ssl.NonValidatingFactory");  // disable server-side validation
-        //when "verify":
-        //    props.setProperty("ssl", "true");
-        //    break;
-        //}
+        if (t.getSsl()) {
+            // TODO add ssl_verify (boolean) option to allow users to verify certification.
+            //      see embulk-input-ftp for SSL implementation.
+            props.setProperty("ssl", "true");
+            props.setProperty("sslfactory", "org.postgresql.ssl.NonValidatingFactory");  // disable server-side validation
+        }
+        // setting ssl=false enables SSL. See org.postgresql.core.v3.openConnectionImpl.
 
         props.putAll(t.getOptions());
 

data/src/main/java/org/embulk/input/postgresql/PostgreSQLInputConnection.java

@@ -20,11 +20,12 @@ public class PostgreSQLInputConnection
     }
 
     @Override
-    protected CursorSelect newBatchSelect(String select, int fetchRows) throws SQLException
+    protected CursorSelect newBatchSelect(String select, int fetchRows, int queryTimeout) throws SQLException
     {
         executeUpdate("DECLARE cur NO SCROLL CURSOR FOR "+select);
 
         String fetchSql = "FETCH FORWARD "+fetchRows+" FROM cur";
+        // Because socketTimeout is set in Connection, don't need to set quertyTimeout.
         return new CursorSelect(fetchSql, connection.prepareStatement(fetchSql));
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-postgresql
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-07 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -22,13 +22,9 @@ 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.6.0.jar
-- classpath/embulk-input-postgresql-0.6.0.jar
-- classpath/jna-4.1.0.jar
-- classpath/jna-platform-4.1.0.jar
-- classpath/postgresql-9.4-1200-jdbc41.jar
-- classpath/slf4j-simple-1.7.7.jar
-- classpath/waffle-jna-1.7.jar
+- classpath/embulk-input-jdbc-0.6.1.jar
+- classpath/embulk-input-postgresql-0.6.1.jar
+- classpath/postgresql-9.4-1205-jdbc41.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0