embulk-output-jdbc 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2782cbd059a5832c46cebd5d78867f1a54791139
-  data.tar.gz: f6e892f5a6a08fc517eca09b4bb5f5fc90a0086d
+  metadata.gz: 22641808f55bed4bec132e7cd317220a6cfc289a
+  data.tar.gz: f6ecc3e8d4fa66dd0f78b79e0c27d99535a11136
 SHA512:
-  metadata.gz: e090013694785cd6867fb3665d009793f7bc3c8cb22002bcb51d4f232bb9ff1eedac9741d9ce66c2135c1ac245b46fe3e3aec702ff7f364a1ca5a185d61036b7
-  data.tar.gz: 5a9b400fd9882c7930b2c7bf839a829eb98aa612d611f3e5c5120dd3692f81f4d1604dac4945c5df328dc3a2bdbb13501a1e4461174ff8abaa68dda5f1029997
+  metadata.gz: 94bc52aa3d7ced7da88fd92f990b8cec391b131f27b4158faeeec7b1c0aad41445fab52389f1c6d2ecaef8d36ff2baa35cf38cc13682cecf2a8e1640c3e46edb
+  data.tar.gz: 4fb618c9f6cb3d23cfccc2999468fb060aee2b811d16686bcd74af929a973acfa07d059c3c93e45d0ce330d21916716d0d07b06982f3035205b7bc1a9ff96497

data/src/main/java/org/embulk/output/JdbcOutputPlugin.java

@@ -1,13 +1,19 @@
 package org.embulk.output;
 
+import java.nio.file.Paths;
+import java.util.Set;
+import java.util.HashSet;
 import java.util.Properties;
 import java.sql.Driver;
 import java.io.IOException;
 import java.sql.Connection;
 import java.sql.SQLException;
+import com.google.common.base.Optional;
 import com.google.common.base.Throwables;
 import org.embulk.spi.Exec;
+import org.embulk.spi.PluginClassLoader;
 import org.embulk.config.Config;
+import org.embulk.config.ConfigDefault;
 import org.embulk.output.jdbc.AbstractJdbcOutputPlugin;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.StandardBatchInsert;
@@ -17,6 +23,8 @@ import org.embulk.output.jdbc.JdbcOutputConnection;
 public class JdbcOutputPlugin
         extends AbstractJdbcOutputPlugin
 {
+    private final static Set<String> loadedJarGlobs = new HashSet<String>();
+
     public interface GenericPluginTask extends PluginTask
     {
         @Config("driver_name")
@@ -24,6 +32,10 @@ public class JdbcOutputPlugin
 
         @Config("driver_class")
         public String getDriverClass();
+
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
     }
 
     @Override
@@ -37,12 +49,22 @@ public class JdbcOutputPlugin
     {
         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());
         }
 
@@ -56,6 +78,13 @@ public class JdbcOutputPlugin
                 g.getSchema().orNull());
     }
 
+    private void loadDriverJar(String glob)
+    {
+        // TODO match glob
+        PluginClassLoader loader = (PluginClassLoader) getClass().getClassLoader();
+        loader.addPath(Paths.get(glob));
+    }
+
     private static class GenericOutputConnector
             implements JdbcOutputConnector
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 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: Inserts or updates records to a table.
 email:
@@ -39,7 +39,7 @@ files:
 - src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
-- classpath/embulk-output-jdbc-0.1.2.jar
+- classpath/embulk-output-jdbc-0.1.3.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0