embulk-input-jdbc 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: debd726a2754ee5ffa81e8b0a19b6f0962edf7e0
-  data.tar.gz: 4fa93d96dc225cf41687ee60b29b4d9d17fc9622
+  metadata.gz: 617c1a978aee468e9f849b9defa0ef3e44d53de5
+  data.tar.gz: 28a1d38053028001e4c2a80f2de513c05d2317c0
 SHA512:
-  metadata.gz: 068f25c21264c1d42cdc1634a3b3a61da127d8e0e859c8cdfeeebb20aa1d35eebd716495dd09ab2903e7d06722bf107a21b911a1c43337f35502f7c0768df928
-  data.tar.gz: d7c1829e071c1123b8877ff22679c4a51f3bf59eaca512620e685690012ce976b3e41ed6a958837f0cf09be8dcbfed2c408ccf0728354b4411febb0a701a784d
+  metadata.gz: 0e891c2884ed461185c87f2634b56d4fa12773c9c271fa53e10d3b0fbb5397c56e321a4111c68fdcec0b30d870f5d58b48afbb18a9632140115ea41fedd39adc
+  data.tar.gz: 3266593494c05a45ebb1a38ec79286f466d9457e23a8cfa5eb3b3ef86e0dead5bf5aa1773bc90767e3b2126a504a4d92e2844362da689bdba8e8439ed8359626

data/README.md

@@ -62,7 +62,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/jdbc/JdbcColumnOption.java

@@ -7,7 +7,6 @@ import org.embulk.config.Task;
 import org.embulk.spi.time.TimestampFormat;
 import org.embulk.spi.type.Type;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 
 import com.google.common.base.Optional;
 
@@ -29,8 +28,4 @@ public interface JdbcColumnOption
     @Config("timezone")
     @ConfigDefault("null")
     public Optional<DateTimeZone> getTimeZone();
-
-    // required by TimestampFormatter
-    @ConfigInject
-    public ScriptingContainer getJRuby();
 }

data/src/main/java/org/embulk/input/jdbc/getter/ColumnGetterFactory.java

@@ -5,11 +5,15 @@ import java.sql.Types;
 import java.util.HashMap;
 import java.util.Map;
 
+import com.google.common.base.Optional;
 import org.embulk.config.ConfigException;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.Task;
 import org.embulk.input.jdbc.AbstractJdbcInputPlugin.PluginTask;
 import org.embulk.input.jdbc.JdbcColumn;
 import org.embulk.input.jdbc.JdbcColumnOption;
 import org.embulk.input.jdbc.JdbcInputConnection;
+import org.embulk.spi.Exec;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.spi.type.TimestampType;
@@ -176,12 +180,21 @@ public class ColumnGetterFactory
         return toType;
     }
 
+    private static interface FormatterIntlTask extends Task, TimestampFormatter.Task {}
+    private static interface FormatterIntlColumnOption extends Task, TimestampFormatter.TimestampColumnOption {}
+
     private TimestampFormatter newTimestampFormatter(JdbcColumnOption option, String defaultTimestampFormat)
     {
+        // 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", option.getTimestampFormat().isPresent()
+                                   ? option.getTimestampFormat().get().getFormat()
+                                   : defaultTimestampFormat);
+        configSource.set("timezone", option.getTimeZone().or(this.defaultTimeZone));
         return new TimestampFormatter(
-                option.getJRuby(),
-                option.getTimestampFormat().isPresent() ? option.getTimestampFormat().get().getFormat() : defaultTimestampFormat,
-                option.getTimeZone().or(defaultTimeZone));
+            Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
+            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
     }
 
     private static UnsupportedOperationException unsupportedOperationException(JdbcColumn column)

data/src/main/java/org/embulk/input/jdbc/getter/TimestampWithTimeZoneIncrementalHandler.java

@@ -1,15 +1,16 @@
 package org.embulk.input.jdbc.getter;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.google.common.base.Optional;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Timestamp;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.Task;
 import org.embulk.spi.Column;
 import org.embulk.spi.Exec;
-import org.embulk.spi.time.TimestampFormatter.FormatterTask;
 import org.embulk.spi.time.TimestampFormatter;
-import org.embulk.spi.time.TimestampParser.ParserTask;
 import org.embulk.spi.time.TimestampParser;
 
 public class TimestampWithTimeZoneIncrementalHandler
@@ -40,25 +41,39 @@ public class TimestampWithTimeZoneIncrementalHandler
         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(ISO_USEC_FORMAT, 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", ISO_USEC_FORMAT);
+        configSource.set("timezone", "UTC");
+        TimestampFormatter formatter = new TimestampFormatter(
+            Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
+            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
         String text = formatter.format(org.embulk.spi.time.Timestamp.ofEpochSecond(epochSecond, nano));
         return jsonNodeFactory.textNode(text);
     }
 
+    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(ISO_USEC_PATTERN, 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", ISO_USEC_PATTERN);
+        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());
 
         Timestamp sqlTimestamp = new Timestamp(epoch.getEpochSecond() * 1000);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 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,7 +19,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - build.gradle
-- classpath/embulk-input-jdbc-0.8.5.jar
+- classpath/embulk-input-jdbc-0.8.6.jar
 - lib/embulk/input/jdbc.rb
 - src/main/java/org/embulk/input/JdbcInputPlugin.java
 - src/main/java/org/embulk/input/jdbc/AbstractJdbcInputPlugin.java