embulk-output-jdbc 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adf000cfbd28d4fb1c8e33f8c11f9551b34c8c70
-  data.tar.gz: dc37c2dd32bc03ff6b92d16a57da20614bd0dd25
+  metadata.gz: 693efe41999ffde2ffae134407fb1b38aedd65ad
+  data.tar.gz: 61862ecaafebf03f884c0c3c1756d6a4381c14e4
 SHA512:
-  metadata.gz: b5768c7090977ee2f5d01ca59808ea6eea7698d07cea80daf29d06617f13a2befc4e7354de954019590f2bd1c2813382ddb4f3ba97bfdb7713906d92822334e6
-  data.tar.gz: 8eea4f3829f024e86e661324edd4b948be3a73725826d94b426c3b08ab760c464496349cad2c4948cda09f5f1abb58e76d03b65bf31fe3f90f0221e5596611c9
+  metadata.gz: ba4055e90152b59309eae136375e455f30b099cddc93d0470fb60fe0fcd3681143d61a5ab4424865e9dc3a68af3b8da0afbd0e764c4a64de89d2c0a51c400fce
+  data.tar.gz: 6a8a60a53f2dae9f38ea0da0cc5a5b890232be4227a683f77a4374d43255a9e7bad4158b809bdf6a0e8b310dd01c283916aa41b6e90310c2df54fea541a0c81b

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

@@ -66,7 +66,7 @@ public abstract class AbstractJdbcOutputPlugin
     {
         @Config("options")
         @ConfigDefault("{}")
-        public Properties getOptions();
+        public ToStringMap getOptions();
 
         @Config("table")
         public String getTable();
@@ -393,7 +393,10 @@ public abstract class AbstractJdbcOutputPlugin
         Mode mode = task.getMode();
         logger.info("Using {} mode", mode);
 
-        Optional<JdbcSchema> initialTargetTableSchema = newJdbcSchemaFromTableIfExists(con, task.getTable());
+        Optional<JdbcSchema> initialTargetTableSchema =
+            mode.ignoreTargetTableSchema() ?
+                Optional.<JdbcSchema>absent() :
+                newJdbcSchemaFromTableIfExists(con, task.getTable());
 
         // TODO get CREATE TABLE statement from task if set
         JdbcSchema newTableSchema = applyColumnOptionsToNewTableSchema(
@@ -432,11 +435,11 @@ public abstract class AbstractJdbcOutputPlugin
 
         // build JdbcSchema from a table
         JdbcSchema targetTableSchema;
-        if (mode.ignoreTargetTableSchema() && taskCount != 0) {
+        if (initialTargetTableSchema.isPresent()) {
+            targetTableSchema = initialTargetTableSchema.get();
+        } else if (task.getIntermediateTables().isPresent() && !task.getIntermediateTables().get().isEmpty()) {
             String firstItermTable = task.getIntermediateTables().get().get(0);
             targetTableSchema = newJdbcSchemaFromTableIfExists(con, firstItermTable).get();
-        } else if (initialTargetTableSchema.isPresent()) {
-            targetTableSchema = initialTargetTableSchema.get();
         } else {
             // also create the target table if not exists
             // CREATE TABLE IF NOT EXISTS xyz
@@ -664,6 +667,11 @@ public abstract class AbstractJdbcOutputPlugin
     public Optional<JdbcSchema> newJdbcSchemaFromTableIfExists(JdbcOutputConnection connection,
             String tableName) throws SQLException
     {
+        if (!connection.tableExists(tableName)) {
+            // DatabaseMetaData.getPrimaryKeys fails if table does not exist
+            return Optional.absent();
+        }
+
         DatabaseMetaData dbm = connection.getMetaData();
         String escape = dbm.getSearchStringEscape();
 

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

@@ -1,12 +1,11 @@
 package org.embulk.output.jdbc;
 
 import java.math.BigDecimal;
+import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.PreparedStatement;
-import java.sql.Date;
-import java.sql.Time;
-import java.sql.Timestamp;
+import org.embulk.spi.time.Timestamp;
 
 public interface BatchInsert
 {
@@ -46,9 +45,9 @@ public interface BatchInsert
 
     public void setBytes(byte[] v) throws IOException, SQLException;
 
-    public void setSqlDate(Date v, int sqlType) throws IOException, SQLException;
+    public void setSqlDate(Timestamp v, Calendar cal) throws IOException, SQLException;
 
-    public void setSqlTime(Time v, int sqlType) throws IOException, SQLException;
+    public void setSqlTime(Timestamp v, Calendar cal) throws IOException, SQLException;
 
-    public void setSqlTimestamp(Timestamp v, int sqlType) throws IOException, SQLException;
+    public void setSqlTimestamp(Timestamp v, Calendar cal) throws IOException, SQLException;
 }

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

@@ -17,7 +17,7 @@ public interface JdbcColumnOption
     public Optional<String> getType();
 
     @Config("value_type")
-    @ConfigDefault("\"coalesce\"")
+    @ConfigDefault("\"coerce\"")
     public String getValueType();
 
     @Config("timestamp_format")

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

@@ -1,15 +1,16 @@
 package org.embulk.output.jdbc;
 
 import java.util.List;
+import java.util.Calendar;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Date;
 import java.sql.Time;
-import java.sql.Timestamp;
 import com.google.common.base.Optional;
 import org.slf4j.Logger;
+import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.Exec;
 
 public class StandardBatchInsert
@@ -163,21 +164,31 @@ public class StandardBatchInsert
         nextColumn(v.length + 4);
     }
 
-    public void setSqlDate(Date v, int sqlType) throws IOException, SQLException
+    public void setSqlDate(Timestamp v, Calendar cal) throws IOException, SQLException
     {
-        batch.setObject(index, v, sqlType);
+        // JavaDoc of java.sql.Time says:
+        // >> To conform with the definition of SQL DATE, the millisecond values wrapped by a java.sql.Date instance must be 'normalized' by setting the hours, minutes, seconds, and milliseconds to zero in the particular time zone with which the instance is associated.
+        cal.setTimeInMillis(v.getEpochSecond() * 1000);
+        cal.set(Calendar.SECOND, 0);
+        cal.set(Calendar.MINUTE, 0);
+        cal.set(Calendar.HOUR_OF_DAY, 0);
+        Date normalized = new Date(cal.getTimeInMillis());
+        batch.setDate(index, normalized, cal);
         nextColumn(32);
     }
 
-    public void setSqlTime(Time v, int sqlType) throws IOException, SQLException
+    public void setSqlTime(Timestamp v, Calendar cal) throws IOException, SQLException
     {
-        batch.setObject(index, v, sqlType);
+        Time t = new Time(v.toEpochMilli());
+        batch.setTime(index, t, cal);
         nextColumn(32);
     }
 
-    public void setSqlTimestamp(Timestamp v, int sqlType) throws IOException, SQLException
+    public void setSqlTimestamp(Timestamp v, Calendar cal) throws IOException, SQLException
     {
-        batch.setObject(index, v, sqlType);
+        java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
+        t.setNanos(v.getNano());
+        batch.setTimestamp(index, t, cal);
         nextColumn(32);
     }
 

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

@@ -0,0 +1,54 @@
+package org.embulk.output.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/output/jdbc/ToStringMap.java

@@ -0,0 +1,35 @@
+package org.embulk.output.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;
+
+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;
+    }
+}

data/src/main/java/org/embulk/output/jdbc/setter/ColumnSetterFactory.java

@@ -1,5 +1,7 @@
 package org.embulk.output.jdbc.setter;
 
+import java.util.Calendar;
+import java.util.Locale;
 import java.sql.Types;
 import org.joda.time.DateTimeZone;
 import org.embulk.spi.time.TimestampFormatter;
@@ -32,7 +34,7 @@ public class ColumnSetterFactory
     public ColumnSetter newColumnSetter(JdbcColumn column, JdbcColumnOption option)
     {
         switch (option.getValueType()) {
-        case "coalesce":
+        case "coerce":
             return newCoalesceColumnSetter(column, option);
         case "byte":
             return new ByteColumnSetter(batch, column, newDefaultValueSetter(column, option));
@@ -53,17 +55,17 @@ public class ColumnSetterFactory
         case "nstring":
             return new NStringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
         case "date":
-            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), getTimeZone(option));
+            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case "time":
-            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option));
+            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case "timestamp":
-            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option));
+            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case "decimal":
             return new BigDecimalColumnSetter(batch, column, newDefaultValueSetter(column, option));
         case "null":
             return new NullColumnSetter(batch, column, newDefaultValueSetter(column, option));
         case "pass":
-            return new PassThroughColumnSetter(batch, column, newDefaultValueSetter(column, option));
+            return new PassThroughColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         default:
             throw new ConfigException(String.format("Unknown value_type '%s' for column '%s'", option.getValueType(), column.getName()));
         }
@@ -74,7 +76,12 @@ public class ColumnSetterFactory
         return new TimestampFormatter(
                 option.getJRuby(),
                 option.getTimestampFormat().getFormat(),
-                option.getTimeZone().or(defaultTimeZone));
+                getTimeZone(option));
+    }
+
+    protected Calendar newCalendar(JdbcColumnOption option)
+    {
+        return Calendar.getInstance(getTimeZone(option).toTimeZone(), Locale.ENGLISH);
     }
 
     protected DateTimeZone getTimeZone(JdbcColumnOption option)
@@ -138,11 +145,11 @@ public class ColumnSetterFactory
 
         // Time
         case Types.DATE:
-            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), getTimeZone(option));
+            return new SqlDateColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case Types.TIME:
-            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option));
+            return new SqlTimeColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case Types.TIMESTAMP:
-            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option));
+            return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
 
         // Null
         case Types.NULL:

data/src/main/java/org/embulk/output/jdbc/setter/PassThroughColumnSetter.java

@@ -1,5 +1,6 @@
 package org.embulk.output.jdbc.setter;
 
+import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
 import org.embulk.spi.time.Timestamp;
@@ -10,10 +11,14 @@ import org.embulk.output.jdbc.BatchInsert;
 public class PassThroughColumnSetter
         extends ColumnSetter
 {
+    private final Calendar calendar;
+
     public PassThroughColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
+            DefaultValueSetter defaultValue,
+            Calendar calendar)
     {
         super(batch, column, defaultValue);
+        this.calendar = calendar;
     }
 
     @Override
@@ -49,8 +54,6 @@ public class PassThroughColumnSetter
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
-        t.setNanos(v.getNano());
-        batch.setSqlTimestamp(t, getSqlType());
+        batch.setSqlTimestamp(v, calendar);
     }
 }

data/src/main/java/org/embulk/output/jdbc/setter/SqlDateColumnSetter.java

@@ -1,9 +1,9 @@
 package org.embulk.output.jdbc.setter;
 
+import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Date;
-import org.joda.time.DateTimeZone;
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
@@ -11,14 +11,14 @@ import org.embulk.output.jdbc.BatchInsert;
 public class SqlDateColumnSetter
         extends ColumnSetter
 {
-    private final DateTimeZone timeZone;
+    private final Calendar calendar;
 
     public SqlDateColumnSetter(BatchInsert batch, JdbcColumn column,
             DefaultValueSetter defaultValue,
-            DateTimeZone timeZone)
+            Calendar calendar)
     {
         super(batch, column, defaultValue);
-        this.timeZone = timeZone;
+        this.calendar = calendar;
     }
 
     @Override
@@ -54,10 +54,6 @@ public class SqlDateColumnSetter
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        // JavaDoc of java.sql.Time says:
-        // >> To conform with the definition of SQL DATE, the millisecond values wrapped by a java.sql.Date instance must be 'normalized' by setting the hours, minutes, seconds, and milliseconds to zero in the particular time zone with which the instance is associated.
-        long normalized = timeZone.convertUTCToLocal(v.toEpochMilli());
-        Date d = new Date(normalized);
-        batch.setSqlDate(d, getSqlType());
+        batch.setSqlDate(v, calendar);
     }
 }

data/src/main/java/org/embulk/output/jdbc/setter/SqlTimeColumnSetter.java

@@ -1,5 +1,6 @@
 package org.embulk.output.jdbc.setter;
 
+import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.sql.Time;
@@ -10,10 +11,14 @@ import org.embulk.output.jdbc.BatchInsert;
 public class SqlTimeColumnSetter
         extends ColumnSetter
 {
+    private final Calendar calendar;
+
     public SqlTimeColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
+            DefaultValueSetter defaultValue,
+            Calendar calendar)
     {
         super(batch, column, defaultValue);
+        this.calendar = calendar;
     }
 
     @Override
@@ -49,7 +54,6 @@ public class SqlTimeColumnSetter
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        Time t = new Time(v.toEpochMilli());
-        batch.setSqlTime(t, getSqlType());
+        batch.setSqlTime(v, calendar);
     }
 }

data/src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java

@@ -1,5 +1,6 @@
 package org.embulk.output.jdbc.setter;
 
+import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
 import org.embulk.spi.time.Timestamp;
@@ -9,10 +10,14 @@ import org.embulk.output.jdbc.BatchInsert;
 public class SqlTimestampColumnSetter
         extends ColumnSetter
 {
+    private final Calendar calendar;
+
     public SqlTimestampColumnSetter(BatchInsert batch, JdbcColumn column,
-            DefaultValueSetter defaultValue)
+            DefaultValueSetter defaultValue,
+            Calendar calendar)
     {
         super(batch, column, defaultValue);
+        this.calendar = calendar;
     }
 
     @Override
@@ -48,8 +53,6 @@ public class SqlTimestampColumnSetter
     @Override
     public void timestampValue(Timestamp v) throws IOException, SQLException
     {
-        java.sql.Timestamp t = new java.sql.Timestamp(v.toEpochMilli());
-        t.setNanos(v.getNano());
-        batch.setSqlTimestamp(t, getSqlType());
+        batch.setSqlTimestamp(v, calendar);
     }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -29,6 +29,8 @@ files:
 - src/main/java/org/embulk/output/jdbc/JdbcSchema.java
 - src/main/java/org/embulk/output/jdbc/JdbcUtils.java
 - src/main/java/org/embulk/output/jdbc/StandardBatchInsert.java
+- src/main/java/org/embulk/output/jdbc/ToString.java
+- src/main/java/org/embulk/output/jdbc/ToStringMap.java
 - src/main/java/org/embulk/output/jdbc/setter/BigDecimalColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/BooleanColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/ByteColumnSetter.java
@@ -51,7 +53,7 @@ files:
 - src/main/java/org/embulk/output/jdbc/setter/SqlTimestampColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/StringColumnSetter.java
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
-- classpath/embulk-output-jdbc-0.3.0.jar
+- classpath/embulk-output-jdbc-0.4.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0