embulk-input-jdbc 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240e726395f1ccd9d29bfc37dcb753efd299180f
-  data.tar.gz: 2070e8347eb7a66808fa663d2a8b9945ef17be57
+  metadata.gz: 448f952857706e80263b5b4fb0fd0a0afb0bc932
+  data.tar.gz: 394b0a3d874564fa7c10e8141f157bc2b71486e6
 SHA512:
-  metadata.gz: dcbfe8d42cb15917e76acf2443454610f4b52357ef1a287bfb860c1e4cdf7780dfc917ac01b9df5cb2f8586783aba3fc5a29b9b9ee3e6bf55a311889408c572b
-  data.tar.gz: e69aa91bfb8c7cfd55eb9ca2dfd1bbc47036d6660124ffc1b4f72a773b3d5399b1b6fe5f9f0fcd3450c67119f3a9c52d350dbf9c6a513d505495aac8da832b0d
+  metadata.gz: 1a0ba32aa3c9ac2169130102fe85eb841c1da236a062a2bff9dcdc4196282d5237a1705261250c52f3234dfb279017dbb47e972325396abfceb685b3bc0b56d4
+  data.tar.gz: 174d493cad631c3bb15cf475ee7aa77aee4db10a4b40cc8350c4b31732517c54410110bafafe8454d3d52f4d364bd5df3571704ddbe3670db7a67be6c86cc880

data/README.md

@@ -14,6 +14,7 @@ Generic JDBC input plugin for Embulk loads records from a database using a JDBC
 - **url**: URL of the JDBC connection (e.g. 'jdbc:sqlite:mydb.sqlite3') (string, required)
 - **user**: database login user name (string, optional)
 - **password**: database login password (string, default: optional)
+- **ssl**: use SSL to connect to the database (string, default: `disable`. `enable` uses SSL without server-side validation and `verify` checks the certificate. For compatibility reasons, `true` behaves as `enable` and `false` behaves as `disable`.)
 - **schema**: destination schema name (string, default: use the default schema)
 - **fetch_rows**: number of rows to fetch one time (integer, default: 10000)
 - **connect_timeout**: not supported.

data/src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java

@@ -184,6 +184,8 @@ public abstract class AbstractJdbcInputPlugin
 
         Schema schema;
         try (JdbcInputConnection con = newConnection(task)) {
+            con.showDriverVersion();
+
             // TODO incremental_columns is not set => get primary key
             schema = setupTask(con, task);
         } catch (SQLException ex) {

data/src/main/java/org/embulk/input/jdbc/JdbcInputConnection.java

@@ -7,6 +7,7 @@ import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Locale;
 import java.util.Set;
 
 import org.embulk.config.ConfigException;
@@ -386,4 +387,9 @@ public class JdbcInputConnection
             return columnNamesBuilder.build();
         }
     }
+
+    public void showDriverVersion() throws SQLException {
+        DatabaseMetaData meta = connection.getMetaData();
+        logger.info(String.format(Locale.ENGLISH,"Using JDBC Driver %s",meta.getDriverVersion()));
+    }
 }

data/src/main/java/org/embulk/input/jdbc/Ssl.java

@@ -0,0 +1,37 @@
+package org.embulk.input.jdbc;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import org.embulk.config.ConfigException;
+
+public enum Ssl
+{
+    ENABLE,
+    DISABLE,
+    VERIFY;
+
+    @JsonValue
+    @Override
+    public String toString()
+    {
+        return this.name().toLowerCase();
+    }
+
+    @JsonCreator
+    public static Ssl fromString(String value)
+    {
+        switch(value) {
+        case "enable":
+        case "true":
+            return ENABLE;
+        case "disable":
+        case "false":
+            return DISABLE;
+        case "verify":
+            return VERIFY;
+        default:
+            throw new ConfigException(String.format("Unknown SSL value '%s'. Supported values are enable, true, disable, false or verify.", value));
+        }
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.3.jar
+- classpath/embulk-input-jdbc-0.8.4.jar
 - lib/embulk/input/jdbc.rb
 - src/main/java/org/embulk/input/JdbcInputPlugin.java
 - src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java
@@ -28,6 +28,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/JdbcInputConnection.java
 - src/main/java/org/embulk/input/jdbc/JdbcLiteral.java
 - src/main/java/org/embulk/input/jdbc/JdbcSchema.java
+- src/main/java/org/embulk/input/jdbc/Ssl.java
 - src/main/java/org/embulk/input/jdbc/ToString.java
 - src/main/java/org/embulk/input/jdbc/ToStringMap.java
 - src/main/java/org/embulk/input/jdbc/getter/AbstractColumnGetter.java