embulk-input-mysql 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba43696df83d63a83d601310565acb3ee822c46a
-  data.tar.gz: 73294973cfef407dd7fedbe748d662d911763933
+  metadata.gz: 82ffc53340f2ef0742c4aa00830de1b59f22dd99
+  data.tar.gz: f33c36841481d1dc53d1aa4691492cbb0d21b147
 SHA512:
-  metadata.gz: a0d7cec83ab2439308895c4803f0d92c0fea0cafff0376050f556dd7104804a20122d828033e12dd08a8da812badb683cd2ab3de033694154bfabac42e9bcc0d
-  data.tar.gz: 7880efc726e147fe90d3f5dba3d235d3c9a6312aa3984a4d54e3e28fb8d94b8ee4878488f5c2d69fdc7d0ca709e19a37d134ae66a5c7e468279e9bc5899eabd0
+  metadata.gz: f293f9ac8219eef1ec152ce8637357132a3be1dd1708a777b2d8331936af8d2d4381ac8fe763a780fcf7a818070d96537f3eee191e7ebe30d1cbd199f857c7de
+  data.tar.gz: c404695b1c2d45d810ff892848ea679c039e8009f0c73d2c26f68127d3666c93114f70f4baecf7edb5797409f9270e450bf1be2afda400fab490b48c39e510f2

data/README.md

@@ -72,7 +72,7 @@ At the next execution, when `last_record: ` is also set, this plugin generates a
 SELECT * FROM (
   ...original query is here...
 )
-WHERE created_at > '2017-01-01 00:32:12' OR (created_at = '2017-01-01 00:32:12' AND id > 5291)
+WHERE updated_at > '2017-01-01 00:32:12' OR (updated_at = '2017-01-01 00:32:12' AND id > 5291)
 ORDER BY updated_at, id
 ```
 

data/src/main/java/org/embulk/input/mysql/getter/AbstractMySQLTimestampIncrementalHandler.java

@@ -1,14 +1,15 @@
 package org.embulk.input.mysql.getter;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.base.Optional;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.Task;
 import org.embulk.input.jdbc.getter.AbstractIncrementalHandler;
 import org.embulk.input.jdbc.getter.ColumnGetter;
 import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
 import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.spi.time.TimestampFormatter.FormatterTask;
 import org.embulk.spi.time.TimestampParser;
-import org.embulk.spi.time.TimestampParser.ParserTask;
 import org.joda.time.DateTimeZone;
 
 import java.sql.PreparedStatement;
@@ -42,13 +43,20 @@ public abstract class AbstractMySQLTimestampIncrementalHandler
         super.getAndSet(from, fromIndex, toColumn);
     }
 
+    private static interface FormatterIntlTask extends Task, TimestampFormatter.Task {}
+    private static interface FormatterIntlColumnOption extends Task, TimestampFormatter.TimestampColumnOption {}
+
     @Override
     public JsonNode encodeToJson()
     {
-        FormatterTask task = Exec.newConfigSource()
-            .set("timezone", "UTC")
-            .loadConfig(FormatterTask.class);
-        TimestampFormatter formatter = new TimestampFormatter(getTimestampFormat(), task);
+        // TODO: Switch to a newer TimestampFormatter constructor after a reasonable interval.
+        // Traditional constructor is used here for compatibility.
+        final ConfigSource configSource = Exec.newConfigSource();
+        configSource.set("format", getTimestampFormat());
+        configSource.set("timezone", "UTC");
+        TimestampFormatter formatter = new TimestampFormatter(
+            Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
+            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
         String text = formatter.format(utcTimestampFromSessionTime(epochSecond, nano));
         return jsonNodeFactory.textNode(text);
     }
@@ -57,14 +65,21 @@ public abstract class AbstractMySQLTimestampIncrementalHandler
 
     protected abstract org.embulk.spi.time.Timestamp utcTimestampFromSessionTime(long epochSecond, int nano);
 
+    private static interface ParserIntlTask extends Task, TimestampParser.Task {}
+    private static interface ParserIntlColumnOption extends Task, TimestampParser.TimestampColumnOption {}
+
     @Override
     public void decodeFromJsonTo(PreparedStatement toStatement, int toIndex, JsonNode fromValue)
             throws SQLException
     {
-        ParserTask task = Exec.newConfigSource()
-            .set("default_timezone", "UTC")
-            .loadConfig(ParserTask.class);
-        TimestampParser parser = new TimestampParser(getTimestampPattern(), task);
+        // TODO: Switch to a newer TimestampParser constructor after a reasonable interval.
+        // Traditional constructor is used here for compatibility.
+        final ConfigSource configSource = Exec.newConfigSource();
+        configSource.set("format", getTimestampPattern());
+        configSource.set("timezone", "UTC");
+        TimestampParser parser = new TimestampParser(
+            Exec.newConfigSource().loadConfig(ParserIntlTask.class),
+            configSource.loadConfig(ParserIntlColumnOption.class));
         org.embulk.spi.time.Timestamp epoch = parser.parse(fromValue.asText());
         toStatement.setTimestamp(toIndex, utcTimestampToSessionTime(epoch));
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-mysql
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-11-24 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -19,8 +19,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.5.jar
-- classpath/embulk-input-mysql-0.8.5.jar
+- classpath/embulk-input-jdbc-0.8.6.jar
+- classpath/embulk-input-mysql-0.8.6.jar
 - default_jdbc_driver/mysql-connector-java-5.1.34.jar
 - lib/embulk/input/mysql.rb
 - src/main/java/org/embulk/input/MySQLInputPlugin.java