embulk-output-jdbc 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22641808f55bed4bec132e7cd317220a6cfc289a
-  data.tar.gz: f6ecc3e8d4fa66dd0f78b79e0c27d99535a11136
+  metadata.gz: 01a92a4a868446c83653516d3028fb5b423f2fdb
+  data.tar.gz: 1894bda08176a5ec0e9be2008d516689d3066871
 SHA512:
-  metadata.gz: 94bc52aa3d7ced7da88fd92f990b8cec391b131f27b4158faeeec7b1c0aad41445fab52389f1c6d2ecaef8d36ff2baa35cf38cc13682cecf2a8e1640c3e46edb
-  data.tar.gz: 4fb618c9f6cb3d23cfccc2999468fb060aee2b811d16686bcd74af929a973acfa07d059c3c93e45d0ce330d21916716d0d07b06982f3035205b7bc1a9ff96497
+  metadata.gz: 3bc0733eec6851d2f953fe32c703177643b21bf09e34d463af4bf876ef7525b8eeaca4070627c41e0cb595b0f875bfac60ffcc6bea18cfa8c4e4779b2f9c1302
+  data.tar.gz: 76ba0c713a4dcd324aae9c9d8502556a082df91b36a9708277e69a8b81a91753bd91b7d8143299bd98fb9878f8f6ad09e77634456ad6fcfff0c0066f103be049

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

@@ -27,15 +27,27 @@ public class JdbcOutputPlugin
 
     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
@@ -47,11 +59,11 @@ public class JdbcOutputPlugin
     @Override
     protected GenericOutputConnector getConnector(PluginTask task, boolean retryableMetadataOperation)
     {
-        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);
@@ -59,23 +71,18 @@ public class JdbcOutputPlugin
             }
         }
 
-        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());
 
-        return new GenericOutputConnector(url, props, g.getDriverClass(),
-                g.getSchema().orNull());
+        return new GenericOutputConnector(t.getUrl(), props, t.getDriverClass(),
+                t.getSchema().orNull());
     }
 
     private void loadDriverJar(String glob)

data/src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java

@@ -45,31 +45,10 @@ public abstract class AbstractJdbcOutputPlugin
     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();
 

data/src/main/java/org/embulk/output/jdbc/JdbcOutputConnection.java

@@ -52,6 +52,7 @@ public class JdbcOutputConnection
         try {
             String sql = "SET search_path TO " + quoteIdentifierString(schema);
             executeUpdate(stmt, sql);
+            commitIfNecessary(connection);
         } finally {
             stmt.close();
         }
@@ -63,10 +64,9 @@ public class JdbcOutputConnection
         try {
             String sql = String.format("DROP TABLE IF EXISTS %s", quoteIdentifierString(tableName));
             executeUpdate(stmt, sql);
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
-            connection.rollback();
-            throw ex;
+            throw safeRollback(connection, ex);
         } finally {
             stmt.close();
         }
@@ -78,10 +78,9 @@ public class JdbcOutputConnection
         try {
             String sql = buildCreateTableIfNotExistsSql(tableName, schema);
             executeUpdate(stmt, sql);
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
-            connection.rollback();
-            throw ex;
+            throw safeRollback(connection, ex);
         } finally {
             stmt.close();
         }
@@ -226,7 +225,7 @@ public class JdbcOutputConnection
             }
             String sql = buildInsertTableSql(fromTable, fromTableSchema, toTable);
             executeUpdate(stmt, sql);
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
             connection.rollback();
             throw ex;
@@ -276,10 +275,9 @@ public class JdbcOutputConnection
     //        }
     //        String sql = buildGatherInsertTables(fromTable, fromTableSchema, toTable);
     //        executeUpdate(stmt, sql);
-    //        connection.commit();
+    //        commitIfNecessary(connection);
     //    } catch (SQLException ex) {
-    //        connection.rollback();
-    //        throw ex;
+    //        throw safeRollback(connection, ex);
     //    } finally {
     //        stmt.close();
     //    }
@@ -307,10 +305,9 @@ public class JdbcOutputConnection
                 executeUpdate(stmt, sql);
             }
 
-            connection.commit();
+            commitIfNecessary(connection);
         } catch (SQLException ex) {
-            connection.rollback();
-            throw ex;
+            throw safeRollback(connection, ex);
         } finally {
             stmt.close();
         }
@@ -420,4 +417,27 @@ public class JdbcOutputConnection
         }
         return count;
     }
+
+    protected void commitIfNecessary(Connection con) throws SQLException
+    {
+        if (!con.getAutoCommit()) {
+            con.commit();
+        }
+    }
+
+    protected SQLException safeRollback(Connection con, SQLException cause)
+    {
+        try {
+            if (!con.getAutoCommit()) {
+                con.rollback();
+            }
+            return cause;
+        } catch (SQLException ex) {
+            if (cause != null) {
+                cause.addSuppressed(ex);
+                return cause;
+            }
+            return ex;
+        }
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.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: 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.3.jar
+- classpath/embulk-output-jdbc-0.2.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0