embulk-input-jdbc 0.9.3 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 89f25bb2c92757d6e3f6aad8cdd9721d58eb216c
-  data.tar.gz: f1195041a5488157685ba4f435b5e0e67276f107
+SHA256:
+  metadata.gz: 2b562467675dad44be8b2a8520d59f757c4324605c7fc6a49fe5a88f7ce3015e
+  data.tar.gz: 6bd9630ac812f6c4dbd839878458dec1084b29a48c573f3c8c728c673ff6ce05
 SHA512:
-  metadata.gz: 66aded100ed9af8b837e9b9d12cf0d43cda252a5f909b6d0d0bbea97143fd3165d02882c5e54aaa3c1f49ab2e4fd804fa7f4bb33c54a915aca282a0be63588ef
-  data.tar.gz: 95bb8bea452106e630740f6ea239a2556c8bee1c36be9fef6318f2be97efc53eefc8844b342b7aba7ea5e659941b63527528ee6392dba9becbab67c1497eafdb
+  metadata.gz: 3c117eb02df61b64e09380a9b6ebe2837a0f3cab5185ccd4453fa90485870d4a114f9918c69c00595802c052daac158d856641e237057f2ebfe2ffc0275740f8
+  data.tar.gz: 91d7b9dae3f561314af06cd45ec59248fe6b34c904aed5dc0901cbdd5fcbe9ece54265a036e691bc11a2679bae359512d2b25c7f9db2ca0b865df07018934975

data/README.md

@@ -29,8 +29,8 @@ Generic JDBC input plugin for Embulk loads records from a database using a JDBC
   - **where**: WHERE condition to filter the rows (string, default: no-condition)
   - **order_by**: expression of ORDER BY to sort rows (e.g. `created_at DESC, id ASC`) (string, default: not sorted)
 - **default_timezone**: If the sql type of a column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted int this default_timezone. You can overwrite timezone for each columns using column_options option. (string, default: `UTC`)
-- **default_column_options**: column_options for each JDBC type as default. Key is a JDBC type (e.g. 'DATE', 'BIGINT'). Value is same as column_options's value.
-- **column_options**: advanced: a key-value pairs where key is a column name and value is options for the column.
+- **default_column_options**: advanced: column_options for each JDBC type as default. key-value pairs where key is a JDBC type (e.g. 'DATE', 'BIGINT') and value is same as column_options's value.
+- **column_options**: advanced: key-value pairs where key is a column name and value is options for the column.
   - **value_type**: embulk get values from database as this value_type. Typically, the value_type determines `getXXX` method of `java.sql.PreparedStatement`. `value_type: json` is an exception which uses `getString` and parses the result as a JSON string.
   (string, default: depends on the sql type of the column. Available values options are: `long`, `double`, `float`, `decimal`, `boolean`, `string`, `json`, `date`, `time`, `timestamp`)
   - **type**: Column values are converted to this embulk type.
@@ -39,6 +39,8 @@ Generic JDBC input plugin for Embulk loads records from a database using a JDBC
   - **timestamp_format**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted by this timestamp_format. And if the embulk type is `timestamp`, this timestamp_format may be used in the output plugin. For example, stdout plugin use the timestamp_format, but *csv formatter plugin doesn't use*. (string, default : `%Y-%m-%d` for `date`, `%H:%M:%S` for `time`, `%Y-%m-%d %H:%M:%S` for `timestamp`)
   - **timezone**: If the sql type of the column is `date`/`time`/`datetime` and the embulk type is `string`, column values are formatted in this timezone.
 (string, value of default_timezone option is used by default)
+- **before_setup**: if set, this SQL will be executed before setup. You can prepare table for input by this option.
+- **before_select**: if set, this SQL will be executed before the SELECT query in the same transaction.
 - **after_select**: if set, this SQL will be executed after the SELECT query in the same transaction.
 
 
@@ -77,6 +79,8 @@ CREATE INDEX embulk_incremental_loading_index ON table (updated_at, id);
 
 Recommended usage is to leave `incremental_columns` unset and let this plugin automatically finds an auto-increment primary key. Currently, only strings and integers are supported as incremental_columns.
 
+TIMESTAMP, TIMESTAMPTZ, DATE and DATETIME are also supported depends on each RDBMS
+
 ### Use incremental loading with raw query
 
 **IMPORTANT**: This is an advanced feature and assume you have an enough knowledge about incremental loading using Embulk and this plugin
@@ -166,7 +170,7 @@ in:
   select: "col1, col2, col3"
   where: "col4 != 'a'"
   default_column_options:
-    DATE: { type: string, timestamp_format: "%Y/%m/%d", timezone: "+0900"}
+    TIMESTAMP: { type: string, timestamp_format: "%Y/%m/%d %H:%M:%S", timezone: "+0900"}
     BIGINT: { type: string }
   column_options:
     col1: {type: long}

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

@@ -151,6 +151,14 @@ public abstract class AbstractJdbcInputPlugin
         @ConfigDefault("{}")
         public Map<String, JdbcColumnOption> getDefaultColumnOptions();
 
+        @Config("before_setup")
+        @ConfigDefault("null")
+        public Optional<String> getBeforeSetup();
+
+        @Config("before_select")
+        @ConfigDefault("null")
+        public Optional<String> getBeforeSelect();
+
         @Config("after_select")
         @ConfigDefault("null")
         public Optional<String> getAfterSelect();
@@ -197,6 +205,11 @@ public abstract class AbstractJdbcInputPlugin
         try (JdbcInputConnection con = newConnection(task)) {
             con.showDriverVersion();
 
+            if (task.getBeforeSetup().isPresent()) {
+                con.executeUpdate(task.getBeforeSetup().get());
+                con.commit();
+            }
+
             // TODO incremental_columns is not set => get primary key
             schema = setupTask(con, task);
         } catch (SQLException ex) {
@@ -474,6 +487,10 @@ public abstract class AbstractJdbcInputPlugin
         LastRecordStore lastRecordStore = null;
 
         try (JdbcInputConnection con = newConnection(task)) {
+            if (task.getBeforeSelect().isPresent()) {
+                con.executeUpdate(task.getBeforeSelect().get());
+            }
+
             List<ColumnGetter> getters = newColumnGetters(con, task, querySchema, pageBuilder);
             try (BatchSelect cursor = con.newSelectCursor(builtQuery, getters, task.getFetchRows(), task.getSocketTimeout())) {
                 while (true) {
@@ -503,8 +520,9 @@ public abstract class AbstractJdbcInputPlugin
             //      after_commit moves those values to the actual table.
             if (task.getAfterSelect().isPresent()) {
                 con.executeUpdate(task.getAfterSelect().get());
-                con.connection.commit();
             }
+            con.commit();
+
         } catch (SQLException ex) {
             throw Throwables.propagate(ex);
         }

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

@@ -480,8 +480,14 @@ public class JdbcInputConnection
         }
     }
 
-    public void showDriverVersion() throws SQLException {
+    public void showDriverVersion() throws SQLException
+    {
         DatabaseMetaData meta = connection.getMetaData();
         logger.info(String.format(Locale.ENGLISH,"Using JDBC Driver %s",meta.getDriverVersion()));
     }
+
+    public void commit() throws SQLException
+    {
+        connection.commit();
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.10.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-08-10 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,7 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.9.3.jar
+- classpath/embulk-input-jdbc-0.10.0.jar
 - lib/embulk/input/jdbc.rb
 - src/main/java/org/embulk/input/JdbcInputPlugin.java
 - src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java
@@ -68,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key:
 specification_version: 4
 summary: JDBC input plugin for Embulk