embulk-output-jdbc 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbaff335a92ae96ab91c1d5a5b6853cf2209f2c7
-  data.tar.gz: 7d5e27296e946bed1fd41176b9c88dfd6610d133
+  metadata.gz: ae6b599749ebe50a9b832c6ba8d0784a6737cb7c
+  data.tar.gz: 43c7475f21f28132563ba0a6592e7fbedb4790e2
 SHA512:
-  metadata.gz: 124ff3d150a516be8ea0cf7fd0f6924be2d7e67e7e1ddb910f1e82ce233548864fa36b10d3c2748dae27fff55745557b151e68c9b8640c572d591dd6b3fd34fd
-  data.tar.gz: 3cf1608f0334843bcb5d2cd53f12ab362036af0270c404e11c4128e0bcaf872e9ef87d890d21cb0a8a71c5962d304b76c3ae237040d154a05211b66733b8bd60
+  metadata.gz: 5bb01073bf551b713858e89f0f7364c428457c51107c25f357d962573ca5556f3623d0d4462b0d44fb75506c936853996c81684c639c7073b0e9921cb54be33b
+  data.tar.gz: 468e740668ce4e9f03edfc001703fcb21017f5380f9fe00f3de71c1de53fe35ce4ee580517c5f8a07cd45ee6fd165633b6994a4999bf2a5db039a09101094ae3

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

@@ -2,7 +2,6 @@ package org.embulk.output.jdbc;
 
 import com.google.common.base.Optional;
 import org.joda.time.DateTimeZone;
-import org.jruby.embed.ScriptingContainer;
 import org.embulk.config.Task;
 import org.embulk.config.Config;
 import org.embulk.config.ConfigDefault;
@@ -27,8 +26,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/output/jdbc/setter/ColumnSetterFactory.java

@@ -1,9 +1,13 @@
 package org.embulk.output.jdbc.setter;
 
+import com.google.common.base.Optional;
 import java.util.Calendar;
 import java.util.Locale;
 import java.sql.Types;
 import org.joda.time.DateTimeZone;
+import org.embulk.config.ConfigSource;
+import org.embulk.config.Task;
+import org.embulk.spi.Exec;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.BatchInsert;
 import org.embulk.output.jdbc.JdbcColumn;
@@ -73,12 +77,19 @@ public class ColumnSetterFactory
         }
     }
 
+    private static interface FormatterIntlTask extends Task, TimestampFormatter.Task {}
+    private static interface FormatterIntlColumnOption extends Task, TimestampFormatter.TimestampColumnOption {}
+
     protected TimestampFormatter newTimestampFormatter(JdbcColumnOption option)
     {
+        // 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().getFormat());
+        configSource.set("timezone", getTimeZone(option));
         return new TimestampFormatter(
-                option.getJRuby(),
-                option.getTimestampFormat().getFormat(),
-                getTimeZone(option));
+            Exec.newConfigSource().loadConfig(FormatterIntlTask.class),
+            Optional.fromNullable(configSource.loadConfig(FormatterIntlColumnOption.class)));
     }
 
     protected Calendar newCalendar(JdbcColumnOption option)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-16 00:00:00.000000000 Z
+date: 2017-11-24 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.11.jar
+- classpath/embulk-output-jdbc-0.7.12.jar
 - lib/embulk/output/jdbc.rb
 - src/main/java/org/embulk/output/JdbcOutputPlugin.java
 - src/main/java/org/embulk/output/jdbc/AbstractJdbcOutputPlugin.java