embulk-input-mysql 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad515b3eb8f28906f971b7f53e5c509334955fa0
-  data.tar.gz: 10475eac9234df6f9849b4d548ae19cb25db7994
+  metadata.gz: e95b049dedfd17520d5aec37672353c4c79b1e0f
+  data.tar.gz: cc6e270fae22085306a866f4fb614f77f7f30d88
 SHA512:
-  metadata.gz: 99f8149f1a4b3ea926b17a1e2739050b410b4cbf8199ca2313bece1ded494e197f84bc9ed37c9830197232e30fa99578eb70f3202b232ac2813964c60faa3474
-  data.tar.gz: c794a8d86163720dc1c625f2fc2ea21a501004af2324a75fd065fdfdc0205cb5d29138ebec8a87b0ec8610bbbd3d488621e2e3ffb31730b2c3bd4c9e5d50b2b8
+  metadata.gz: 97f583757f6ec44fba8f2eb4103bffdb09aef579e4745c1121c09a8194c98503a49d31d33e7e7fbe34af3629f8b2f427d09af020e5afcce98c060937c7ab7ba7
+  data.tar.gz: 282b89a3573cc9145fddd2ff7bc181a212ed516c769a7df4d9f84a84349bd3eeddaa8275547b35dab47e4c607960ad8fce1f75c0525325e55342772bdac66254

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

@@ -12,6 +12,7 @@ import com.mysql.jdbc.TimeUtil;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
+import org.embulk.input.jdbc.Ssl;
 import org.embulk.input.jdbc.JdbcInputConnection;
 import org.embulk.input.jdbc.getter.ColumnGetterFactory;
 import org.embulk.input.mysql.MySQLInputConnection;
@@ -42,6 +43,10 @@ public class MySQLInputPlugin
 
         @Config("database")
         public String getDatabase();
+
+        @Config("ssl")
+        @ConfigDefault("\"disable\"") // backward compatibility
+        public Ssl getSsl();
     }
 
     @Override
@@ -75,21 +80,21 @@ public class MySQLInputPlugin
         // Socket options TCP_KEEPCNT, TCP_KEEPIDLE, and TCP_KEEPINTVL are not configurable.
         props.setProperty("tcpKeepAlive", "true");
 
-        // TODO
-        //switch task.getSssl() {
-        //when "disable":
-        //    break;
-        //when "enable":
-        //    props.setProperty("useSSL", "true");
-        //    props.setProperty("requireSSL", "false");
-        //    props.setProperty("verifyServerCertificate", "false");
-        //    break;
-        //when "verify":
-        //    props.setProperty("useSSL", "true");
-        //    props.setProperty("requireSSL", "true");
-        //    props.setProperty("verifyServerCertificate", "true");
-        //    break;
-        //}
+        switch (t.getSsl()) {
+            case DISABLE:
+                props.setProperty("useSSL", "false");
+                break;
+            case ENABLE:
+                props.setProperty("useSSL", "true");
+                props.setProperty("requireSSL", "true");
+                props.setProperty("verifyServerCertificate", "false");
+                break;
+            case VERIFY:
+                props.setProperty("useSSL", "true");
+                props.setProperty("requireSSL", "true");
+                props.setProperty("verifyServerCertificate", "true");
+                break;
+        }
 
         if (t.getFetchRows() == 1) {
             logger.info("Fetch size is 1. Fetching rows one by one.");

data/src/main/java/org/embulk/input/mysql/MySQLInputConnection.java

@@ -67,4 +67,19 @@ public class MySQLInputConnection
         timeZoneComparison.compareTimeZone();
     }
 
+    //
+    //
+    // The MySQL Connector/J 5.1.35 introduce new option `Current MySQL Connect`.
+    // It has incompatibility behavior current version and 5.1.35.
+    //
+    // This method announces users about this change before the update driver version.
+    //
+    @Override
+    public void showDriverVersion() throws SQLException {
+        super.showDriverVersion();
+        logger.warn("This plugin will update MySQL Connector/J version in the near future release.");
+        logger.warn("It has some incompatibility changes.");
+        logger.warn("For example, the 5.1.35 introduced `noTimezoneConversionForDateType` and `cacheDefaultTimezone` options.");
+        logger.warn("Please read a document and make sure configuration carefully before updating the plugin.");
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 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,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.3.jar
-- classpath/embulk-input-mysql-0.8.3.jar
+- classpath/embulk-input-jdbc-0.8.4.jar
+- classpath/embulk-input-mysql-0.8.4.jar
 - classpath/mysql-connector-java-5.1.34.jar
 - lib/embulk/input/mysql.rb
 - src/main/java/org/embulk/input/MySQLInputPlugin.java