embulk-output-jdbc 0.7.6 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6729cd334930e262ef325fd5cd954e5c71893b40
-  data.tar.gz: 5f06aa77e9c76e0517a40334ae0f9b42b4c43c35
+  metadata.gz: d34620b8b097cd388a2c29b0f2d7e395ea9aa858
+  data.tar.gz: fc7b31df19c617e9a9e930417c372d3d9f0be981
 SHA512:
-  metadata.gz: 7ca1405dffcde39385c6953b5e48580f7c16dcf3e45665af56e34d167d0338aa09818df3390e5318680caddd4b1a2f7d122975ac5ca0e702fcd011f9fe0745a1
-  data.tar.gz: 720c5b9defa2a83235a6c4a792ccafd67ca944b0d475bebea86b1e4727a07eadf9784b07a9a0ba9cd82f0195e1a63f4b1f2408e7ba20175d30085b4aa3462948
+  metadata.gz: aba1b8193aaf2d5e3bc02a5148442c7b74ddd579eaf8c1ea701d30447a7105b45df5f26251de6607e7a27bc394f77f200e3df4d5ca16e53adc4af81c836bc8b8
+  data.tar.gz: 6ddf11bed1077c07a5e5f2610b509881cdea9f1bc1276d9a8923cecc7cad9317365259483c5be7d249961c73c6d3ba665258a052e57f2aa4251018214692abe5

data/README.md

@@ -30,6 +30,7 @@ Generic JDBC output plugin for Embulk loads records to a database using a JDBC d
   - **value_type**: This plugin converts input column type (embulk type) into a database type to build a INSERT statement. This value_type option controls the type of the value in a INSERT statement. (string, default: depends on the sql type of the column. Available values options are: `byte`, `short`, `int`, `long`, `double`, `float`, `boolean`, `string`, `nstring`, `date`, `time`, `timestamp`, `decimal`, `json`, `null`, `pass`)
   - **timestamp_format**: If input column type (embulk type) is timestamp and value_type is `string` or `nstring`, this plugin needs to format the timestamp value into a string. This timestamp_format option is used to control the format of the timestamp. (string, default: `%Y-%m-%d %H:%M:%S.%6N`)
   - **timezone**: If input column type (embulk type) is timestamp, this plugin needs to format the timestamp value into a SQL string. In this cases, this timezone option is used to control the timezone. (string, value of default_timezone option is used by default)
+- **before_load**: if set, this SQL will be executed before loading all records. In truncate_insert mode, the SQL will be executed after truncating. replace mode doesn't support this option.
 - **after_load**: if set, this SQL will be executed after loading all records.
 
 ## Modes

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

@@ -108,6 +108,10 @@ public abstract class AbstractJdbcOutputPlugin
         @ConfigDefault("null")
         public Optional<List<String>> getMergeRule();
 
+        @Config("before_load")
+        @ConfigDefault("null")
+        public Optional<String> getBeforeLoad();
+
         @Config("after_load")
         @ConfigDefault("null")
         public Optional<String> getAfterLoad();
@@ -453,6 +457,10 @@ public abstract class AbstractJdbcOutputPlugin
         Mode mode = task.getMode();
         logger.info("Using {} mode", mode);
 
+        if (mode.commitBySwapTable() && task.getBeforeLoad().isPresent()) {
+            throw new ConfigException(String.format("%s mode does not support 'before_load' option.", mode));
+        }
+
         if (con.tableExists(task.getTable())) {
             task.setActualTable(task.getTable());
         } else {
@@ -514,6 +522,9 @@ public abstract class AbstractJdbcOutputPlugin
             }
         } else {
             task.setIntermediateTables(Optional.<List<String>>absent());
+            if (task.getBeforeLoad().isPresent()) {
+                con.executeSql(task.getBeforeLoad().get());
+            }
         }
 
         // build JdbcSchema from a table
@@ -675,7 +686,7 @@ public abstract class AbstractJdbcOutputPlugin
         switch (task.getMode()) {
         case INSERT_DIRECT:
         case MERGE_DIRECT:
-            // already done
+            // already loaded
             if (task.getAfterLoad().isPresent()) {
                 con.executeSql(task.getAfterLoad().get());
             }
@@ -686,7 +697,7 @@ public abstract class AbstractJdbcOutputPlugin
             if (task.getNewTableSchema().isPresent()) {
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), false, task.getAfterLoad());
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), false, task.getBeforeLoad(), task.getAfterLoad());
             break;
 
         case TRUNCATE_INSERT:
@@ -694,7 +705,7 @@ public abstract class AbstractJdbcOutputPlugin
             if (task.getNewTableSchema().isPresent()) {
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
-            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), true, task.getAfterLoad());
+            con.collectInsert(task.getIntermediateTables().get(), schema, task.getActualTable(), true, task.getBeforeLoad(), task.getAfterLoad());
             break;
 
         case MERGE:
@@ -703,7 +714,7 @@ public abstract class AbstractJdbcOutputPlugin
                 con.createTableIfNotExists(task.getActualTable(), task.getNewTableSchema().get());
             }
             con.collectMerge(task.getIntermediateTables().get(), schema, task.getActualTable(),
-                    new MergeConfig(task.getMergeKeys().get(), task.getMergeRule()), task.getAfterLoad());
+                    new MergeConfig(task.getMergeKeys().get(), task.getMergeRule()), task.getBeforeLoad(), task.getAfterLoad());
             break;
 
         case REPLACE:

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

@@ -294,7 +294,7 @@ public class JdbcOutputConnection
     }
 
     protected void collectInsert(List<String> fromTables, JdbcSchema schema, String toTable,
-            boolean truncateDestinationFirst, Optional<String> additionalSql) throws SQLException
+            boolean truncateDestinationFirst, Optional<String> preSql, Optional<String> postSql) throws SQLException
     {
         if (fromTables.isEmpty()) {
             return;
@@ -306,11 +306,18 @@ public class JdbcOutputConnection
                 String sql = buildTruncateSql(toTable);
                 executeUpdate(stmt, sql);
             }
+
+            if (preSql.isPresent()) {
+                executeUpdate(stmt, preSql.get());
+            }
+
             String sql = buildCollectInsertSql(fromTables, schema, toTable);
             executeUpdate(stmt, sql);
-            if (additionalSql.isPresent()) {
-                executeUpdate(stmt, additionalSql.get());
+
+            if (postSql.isPresent()) {
+                executeUpdate(stmt, postSql.get());
             }
+
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -356,7 +363,7 @@ public class JdbcOutputConnection
     }
 
     protected void collectMerge(List<String> fromTables, JdbcSchema schema, String toTable, MergeConfig mergeConfig,
-            Optional<String> additionalSql) throws SQLException
+            Optional<String> preSql, Optional<String> postSql) throws SQLException
     {
         if (fromTables.isEmpty()) {
             return;
@@ -364,11 +371,17 @@ public class JdbcOutputConnection
 
         Statement stmt = connection.createStatement();
         try {
+            if (preSql.isPresent()) {
+                executeUpdate(stmt, preSql.get());
+            }
+
             String sql = buildCollectMergeSql(fromTables, schema, toTable, mergeConfig);
             executeUpdate(stmt, sql);
-            if (additionalSql.isPresent()) {
-                executeUpdate(stmt, additionalSql.get());
+
+            if (postSql.isPresent()) {
+                executeUpdate(stmt, postSql.get());
             }
+
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);
@@ -382,15 +395,18 @@ public class JdbcOutputConnection
         throw new UnsupportedOperationException("not implemented");
     }
 
-    public void replaceTable(String fromTable, JdbcSchema schema, String toTable, Optional<String> additionalSql) throws SQLException
+    public void replaceTable(String fromTable, JdbcSchema schema, String toTable, Optional<String> postSql) throws SQLException
     {
         Statement stmt = connection.createStatement();
         try {
             dropTableIfExists(stmt, toTable);
+
             executeUpdate(stmt, buildRenameTableSql(fromTable, toTable));
-            if (additionalSql.isPresent()) {
-                executeUpdate(stmt, additionalSql.get());
+
+            if (postSql.isPresent()) {
+                executeUpdate(stmt, postSql.get());
             }
+
             commitIfNecessary(connection);
         } catch (SQLException ex) {
             throw safeRollback(connection, ex);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-23 00:00:00.000000000 Z
+date: 2017-04-13 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-output-jdbc-0.7.6.jar
+- classpath/embulk-output-jdbc-0.7.7.jar
 - lib/embulk/output/jdbc.rb
 - src/main/java/org/embulk/output/JdbcOutputPlugin.java
 - src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java