embulk-input-jdbc 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a550ebcfbfdf2ffd7224f75e0323e2f2f38d251
-  data.tar.gz: 94fd015df489f76a7ab61f96d8270e41cf835c47
+  metadata.gz: 8f90e12c2fee1a30c130f033663488322ea010a9
+  data.tar.gz: 9dbae6a7d01b3bda36606b6f269f1f7d2fdcddc9
 SHA512:
-  metadata.gz: fe03d9383723b67c6e7bfad40e846af35e28a6005c23481e8ef3d0371bb32153c3707249251fbd54f3e4dd486127998b7fe331cac86a116d900008e9b6eeb58d
-  data.tar.gz: 36c39dd512041e1191cb18b2b53c7c8b9fe9d2d74546bc39742c2f0da6aaaed4830d89033a21175f44895940febeaa5b1b3baba04bd13baa78af8e5fa5521408
+  metadata.gz: 3dbed8686fd882876041fe10914297a63d7cce394ef3e686abc12bba4104f0ac88e3e59b8ce100da98fffa8bbf31bc2f4f040ad77b2c310312e7da441113958a
+  data.tar.gz: e53a6be622d0ec449c946990cdaedb8a21b3fa83d3a593894dee39675adc3e793bb5c5d1718ae5eda5da8c28895a494abe5ffa0bd5b0a96e82f1b0c1582b5f82

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

@@ -20,17 +20,30 @@ public class JdbcInputPlugin
 {
     private final static Set<String> loadedJarGlobs = new HashSet<String>();
 
-    public interface GenericPluginTask extends PluginTask
+    public interface GenericPluginTask
+            extends PluginTask
     {
-        @Config("driver_name")
-        public String getDriverName();
+        @Config("driver_path")
+        @ConfigDefault("null")
+        public Optional<String> getDriverPath();
 
         @Config("driver_class")
         public String getDriverClass();
 
-        @Config("driver_path")
+        @Config("url")
+        public String getUrl();
+
+        @Config("user")
         @ConfigDefault("null")
-        public Optional<String> getDriverPath();
+        public Optional<String> getUser();
+
+        @Config("password")
+        @ConfigDefault("null")
+        public Optional<String> getPassword();
+
+        @Config("schema")
+        @ConfigDefault("null")
+        public Optional<String> getSchema();
     }
 
     @Override
@@ -42,11 +55,11 @@ public class JdbcInputPlugin
     @Override
     protected JdbcInputConnection newConnection(PluginTask task) throws SQLException
     {
-        GenericPluginTask g = (GenericPluginTask) task;
+        GenericPluginTask t = (GenericPluginTask) task;
 
-        if (g.getDriverPath().isPresent()) {
+        if (t.getDriverPath().isPresent()) {
             synchronized (loadedJarGlobs) {
-                String glob = g.getDriverPath().get();
+                String glob = t.getDriverPath().get();
                 if (!loadedJarGlobs.contains(glob)) {
                     loadDriverJar(glob);
                     loadedJarGlobs.add(glob);
@@ -54,33 +67,28 @@ public class JdbcInputPlugin
             }
         }
 
-        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/%s",
-                    g.getDriverName(), g.getHost(), g.getDatabase());
-        }
-
         Properties props = new Properties();
-        props.setProperty("user", g.getUser());
-        props.setProperty("password", g.getPassword());
+        if (t.getUser().isPresent()) {
+            props.setProperty("user", t.getUser().get());
+        }
+        if (t.getPassword().isPresent()) {
+            props.setProperty("password", t.getPassword().get());
+        }
 
-        props.putAll(g.getOptions());
+        props.putAll(t.getOptions());
 
         Driver driver;
         try {
             // TODO check Class.forName(driverClass) is a Driver before newInstance
             //      for security
-            driver = (Driver) Class.forName(g.getDriverClass()).newInstance();
+            driver = (Driver) Class.forName(t.getDriverClass()).newInstance();
         } catch (Exception ex) {
             throw Throwables.propagate(ex);
         }
 
-        Connection con = driver.connect(url, props);
+        Connection con = driver.connect(t.getUrl(), props);
         try {
-            JdbcInputConnection c = new JdbcInputConnection(con, g.getSchema().orNull());
+            JdbcInputConnection c = new JdbcInputConnection(con, t.getSchema().orNull());
             con = null;
             return c;
         } finally {

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

@@ -34,31 +34,10 @@ public abstract class AbstractJdbcInputPlugin
 
     public interface PluginTask extends Task
     {
-        @Config("host")
-        public String getHost();
-
-        @Config("port")
-        @ConfigDefault("null")
-        public Optional<Integer> getPort();
-
-        @Config("user")
-        public String getUser();
-
-        @Config("password")
-        @ConfigDefault("\"\"")
-        public String getPassword();
-
         @Config("options")
         @ConfigDefault("{}")
         public Properties getOptions();
 
-        @Config("database")
-        public String getDatabase();
-
-        @Config("schema")
-        @ConfigDefault("null")
-        public Optional<String> getSchema();
-
         @Config("table")
         public String getTable();
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -27,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.4.jar
+- classpath/embulk-input-jdbc-0.3.0.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0