embulk-input-jdbc 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66b6a0393c208e0f72362ae4900c1edab3ee8414
-  data.tar.gz: 9c3bbcd05e9060de1d9ad5582c5466844a7fa646
+  metadata.gz: 4a550ebcfbfdf2ffd7224f75e0323e2f2f38d251
+  data.tar.gz: 94fd015df489f76a7ab61f96d8270e41cf835c47
 SHA512:
-  metadata.gz: 812454e4444cd528ecfd3b7682cfbb0e56a2068cc78647c3f42fd57e01f56ab66ae48ff2b489f214491d45cd473c29524c051d497e924a3259c593707e56789d
-  data.tar.gz: 15641bd9e9016db7a6639cb76c177ae3e522bf7137f61862995685f9e621ee93f8ed3a5cea043a56324abfef5250669fb194011aee9db5953725f8cd85c0c5a6
+  metadata.gz: fe03d9383723b67c6e7bfad40e846af35e28a6005c23481e8ef3d0371bb32153c3707249251fbd54f3e4dd486127998b7fe331cac86a116d900008e9b6eeb58d
+  data.tar.gz: 36c39dd512041e1191cb18b2b53c7c8b9fe9d2d74546bc39742c2f0da6aaaed4830d89033a21175f44895940febeaa5b1b3baba04bd13baa78af8e5fa5521408

data/lib/embulk/input/jdbc.rb

@@ -0,0 +1,3 @@
+Embulk::JavaPlugin.register_input(
+  :jdbc, "org.embulk.input.JdbcInputPlugin",
+  File.expand_path('../../../../classpath', __FILE__))

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

@@ -1,17 +1,25 @@
 package org.embulk.input;
 
+import java.nio.file.Paths;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.Properties;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.SQLException;
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
+import org.embulk.spi.PluginClassLoader;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigDefault;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin;
 import org.embulk.input.jdbc.JdbcInputConnection;
 
 public class JdbcInputPlugin
         extends AbstractJdbcInputPlugin
 {
+    private final static Set<String> loadedJarGlobs = new HashSet<String>();
+
     public interface GenericPluginTask extends PluginTask
     {
         @Config("driver_name")
@@ -19,6 +27,10 @@ public class JdbcInputPlugin
 
         @Config("driver_class")
         public String getDriverClass();
+
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
     }
 
     @Override
@@ -32,12 +44,22 @@ public class JdbcInputPlugin
     {
         GenericPluginTask g = (GenericPluginTask) task;
 
+        if (g.getDriverPath().isPresent()) {
+            synchronized (loadedJarGlobs) {
+                String glob = g.getDriverPath().get();
+                if (!loadedJarGlobs.contains(glob)) {
+                    loadDriverJar(glob);
+                    loadedJarGlobs.add(glob);
+                }
+            }
+        }
+
         String url;
         if (g.getPort().isPresent()) {
             url = String.format("jdbc:%s://%s:%d/%s",
                     g.getDriverName(), g.getHost(), g.getPort().get(), g.getDatabase());
         } else {
-            url = String.format("jdbc:%s://%s:%d/%s",
+            url = String.format("jdbc:%s://%s/%s",
                     g.getDriverName(), g.getHost(), g.getDatabase());
         }
 
@@ -67,4 +89,11 @@ public class JdbcInputPlugin
             }
         }
     }
+
+    private void loadDriverJar(String glob)
+    {
+        // TODO match glob
+        PluginClassLoader loader = (PluginClassLoader) getClass().getClassLoader();
+        loader.addPath(Paths.get(glob));
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - build.gradle
+- lib/embulk/input/jdbc.rb
 - src/main/java/org/embulk/input/JdbcInputPlugin.java
 - src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java
 - src/main/java/org/embulk/input/jdbc/JdbcColumn.java
@@ -26,7 +27,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetterFactory.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetters.java
-- classpath/embulk-input-jdbc-0.2.3.jar
+- classpath/embulk-input-jdbc-0.2.4.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0