embulk-input-mysql 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e95b049dedfd17520d5aec37672353c4c79b1e0f
-  data.tar.gz: cc6e270fae22085306a866f4fb614f77f7f30d88
+  metadata.gz: ba43696df83d63a83d601310565acb3ee822c46a
+  data.tar.gz: 73294973cfef407dd7fedbe748d662d911763933
 SHA512:
-  metadata.gz: 97f583757f6ec44fba8f2eb4103bffdb09aef579e4745c1121c09a8194c98503a49d31d33e7e7fbe34af3629f8b2f427d09af020e5afcce98c060937c7ab7ba7
-  data.tar.gz: 282b89a3573cc9145fddd2ff7bc181a212ed516c769a7df4d9f84a84349bd3eeddaa8275547b35dab47e4c607960ad8fce1f75c0525325e55342772bdac66254
+  metadata.gz: a0d7cec83ab2439308895c4803f0d92c0fea0cafff0376050f556dd7104804a20122d828033e12dd08a8da812badb683cd2ab3de033694154bfabac42e9bcc0d
+  data.tar.gz: 7880efc726e147fe90d3f5dba3d235d3c9a6312aa3984a4d54e3e28fb8d94b8ee4878488f5c2d69fdc7d0ca709e19a37d134ae66a5c7e468279e9bc5899eabd0

data/README.md

@@ -9,6 +9,7 @@ MySQL input plugin for Embulk loads records from MySQL.
 
 ## Configuration
 
+- **driver_path**: path to the jar file of the MySQL JDBC driver. If not set, the bundled JDBC driver (MySQL Connector/J 5.1.34) will be used. (string)
 - **host**: database host name (string, required)
 - **port**: database port number (integer, 3306)
 - **user**: database login user name (string, required)

data/build.gradle

@@ -2,6 +2,7 @@ dependencies {
     compile project(':embulk-input-jdbc')
 
     compile 'mysql:mysql-connector-java:5.1.34'
+    defaultJdbcDriver 'mysql:mysql-connector-java:5.1.34'
 
     testCompile 'org.embulk:embulk-standards:0.8.15'
 }

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

@@ -4,11 +4,12 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Properties;
 import java.sql.Connection;
-import java.sql.Driver;
+import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
-import com.mysql.jdbc.TimeUtil;
+
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
@@ -27,6 +28,10 @@ public class MySQLInputPlugin
     public interface MySQLPluginTask
             extends PluginTask
     {
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
+
         @Config("host")
         public String getHost();
 
@@ -60,6 +65,8 @@ public class MySQLInputPlugin
     {
         MySQLPluginTask t = (MySQLPluginTask) task;
 
+        loadDriver("com.mysql.jdbc.Driver", t.getDriverPath());
+
         String url = String.format("jdbc:mysql://%s:%d/%s",
                 t.getHost(), t.getPort(), t.getDatabase());
 
@@ -67,7 +74,7 @@ public class MySQLInputPlugin
         props.setProperty("user", t.getUser());
         props.setProperty("password", t.getPassword());
 
-        // convert 0000-00-00 to NULL to avoid this exceptoin:
+        // convert 0000-00-00 to NULL to avoid this exception:
         //   java.sql.SQLException: Value '0000-00-00' can not be represented as java.sql.Date
         props.setProperty("zeroDateTimeBehavior", "convertToNull");
 
@@ -110,14 +117,7 @@ public class MySQLInputPlugin
         // load timezone mappings
         loadTimeZoneMappings();
 
-        Driver driver;
-        try {
-            driver = new com.mysql.jdbc.Driver();  // new com.mysql.jdbc.Driver throws SQLException
-        } catch (SQLException ex) {
-            throw new RuntimeException(ex);
-        }
-
-        Connection con = driver.connect(url, props);
+        Connection con = DriverManager.getConnection(url, props);
         try {
             MySQLInputConnection c = new MySQLInputConnection(con);
             con = null;
@@ -149,19 +149,20 @@ public class MySQLInputPlugin
         // Here implements a workaround as as workaround.
         Field f = null;
         try {
-            f = TimeUtil.class.getDeclaredField("timeZoneMappings");
+            Class<?> timeUtilClass = Class.forName("com.mysql.jdbc.TimeUtil");
+            f = timeUtilClass.getDeclaredField("timeZoneMappings");
             f.setAccessible(true);
 
             Properties timeZoneMappings = (Properties) f.get(null);
             if (timeZoneMappings == null) {
                 timeZoneMappings = new Properties();
-                synchronized (TimeUtil.class) {
+                synchronized (timeUtilClass) {
                     timeZoneMappings.load(this.getClass().getResourceAsStream("/com/mysql/jdbc/TimeZoneMapping.properties"));
                 }
                 f.set(null, timeZoneMappings);
             }
         }
-        catch (IllegalAccessException | NoSuchFieldException | IOException e) {
+        catch (ClassNotFoundException | IllegalAccessException | NoSuchFieldException | IOException e) {
             throw Throwables.propagate(e);
         }
         finally {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,9 +19,9 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.4.jar
-- classpath/embulk-input-mysql-0.8.4.jar
-- classpath/mysql-connector-java-5.1.34.jar
+- classpath/embulk-input-jdbc-0.8.5.jar
+- classpath/embulk-input-mysql-0.8.5.jar
+- default_jdbc_driver/mysql-connector-java-5.1.34.jar
 - lib/embulk/input/mysql.rb
 - src/main/java/org/embulk/input/MySQLInputPlugin.java
 - src/main/java/org/embulk/input/MySQLTimeZoneComparison.java