embulk-input-jdbc 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58343b1cbca7d7302990e5ae707abd6093c50a6e
-  data.tar.gz: 1f20480bd02215e50e9e297ab71b8edbf7737f1a
+  metadata.gz: a21cec9ce3a1a38d3328338e06044dfd492f47f7
+  data.tar.gz: 1e306f57cda5959b21bfd6ccfa71415181297259
 SHA512:
-  metadata.gz: a79c9b92ca7b98df26ad863382a8351266b1acaebfb218429000e47132a081afe692f3ba2f543bbb6a2bf768e2eba756cc4fe510c184eb941858ca04fd9e854f
-  data.tar.gz: cf26a3cbf0ece3949506e6ac9f282eb08c338f39bb9b1cb929b09a2bad9fcaf5d3d08703090dea09a27ebe740cb562382dc55422acf06f9776adfd916abcfb7b
+  metadata.gz: d07d396a4ae59a862b2bb53f94d1246d5c3b98306465b2f2e0ee0778a4517697fca874dd381c115e77f03d91db7fd1ce47978d600ace53136fea9ffadccdf60b
+  data.tar.gz: a09e9719778a2ec55f3506cb56a345288ab944194623b9a7dd5f116748c33dc90c75f0e9219f53442bcdd629e160b66dd170f16e701bc07f6164ef75c7bea7ef

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

@@ -2,7 +2,6 @@ package org.embulk.input.jdbc;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.nio.file.Paths;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -23,12 +22,12 @@ import org.embulk.config.ConfigInject;
 import org.embulk.config.ConfigSource;
 import org.embulk.config.Task;
 import org.embulk.config.TaskSource;
+import org.embulk.plugin.PluginClassLoader;
 import org.embulk.spi.BufferAllocator;
 import org.embulk.spi.Column;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.InputPlugin;
 import org.embulk.spi.PageOutput;
-import org.embulk.spi.PluginClassLoader;
 import org.embulk.spi.Schema;
 import org.embulk.spi.Exec;
 import org.embulk.input.jdbc.getter.ColumnGetter;
@@ -45,7 +44,7 @@ public abstract class AbstractJdbcInputPlugin
     {
         @Config("options")
         @ConfigDefault("{}")
-        public Properties getOptions();
+        public ToStringMap getOptions();
 
         @Config("table")
         @ConfigDefault("null")

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

@@ -0,0 +1,54 @@
+package org.embulk.input.jdbc;
+
+import com.google.common.base.Optional;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.node.NullNode;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class ToString
+{
+    private final String string;
+
+    public ToString(String string)
+    {
+        this.string = string;
+    }
+
+    @JsonCreator
+    ToString(Optional<JsonNode> option) throws JsonMappingException
+    {
+        JsonNode node = option.or(NullNode.getInstance());
+        if (node.isTextual()) {
+            this.string = node.textValue();
+        } else if (node.isValueNode()) {
+            this.string = node.toString();
+        } else {
+            throw new JsonMappingException(String.format("Arrays and objects are invalid: '%s'", node));
+        }
+    }
+
+    @Override
+    public boolean equals(Object obj)
+    {
+        if (!(obj instanceof ToString)) {
+            return false;
+        }
+        ToString o = (ToString) obj;
+        return string.equals(o.string);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return string.hashCode();
+    }
+
+    @JsonValue
+    @Override
+    public String toString()
+    {
+        return string;
+    }
+}

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

@@ -0,0 +1,36 @@
+package org.embulk.input.jdbc;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Properties;
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+// TODO copied from embulk-output-jdbc. Move this class to embulk-core spi.unit.
+public class ToStringMap
+        extends HashMap<String, String>
+{
+    @JsonCreator
+    ToStringMap(Map<String, ToString> map)
+    {
+        super(Maps.transformValues(map, new Function<ToString, String>() {
+            public String apply(ToString value)
+            {
+                if (value == null) {
+                    return "null";
+                } else {
+                    return value.toString();
+                }
+            }
+        }));
+    }
+
+    public Properties toProperties()
+    {
+        Properties props = new Properties();
+        props.putAll(this);
+        return props;
+    }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-17 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies: []
 description: Selects records from a table.
 email:
@@ -25,6 +25,8 @@ files:
 - src/main/java/org/embulk/input/jdbc/JdbcColumnOption.java
 - src/main/java/org/embulk/input/jdbc/JdbcInputConnection.java
 - src/main/java/org/embulk/input/jdbc/JdbcSchema.java
+- src/main/java/org/embulk/input/jdbc/ToString.java
+- src/main/java/org/embulk/input/jdbc/ToStringMap.java
 - src/main/java/org/embulk/input/jdbc/getter/AbstractColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/AbstractTimestampColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/BigDecimalColumnGetter.java
@@ -38,7 +40,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/StringColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/TimeColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/TimestampColumnGetter.java
-- classpath/embulk-input-jdbc-0.5.0.jar
+- classpath/embulk-input-jdbc-0.6.0.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0