embulk-output-jdbc 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fcb08c1a3c9afee4fbf4ceaff31436edaf7530
-  data.tar.gz: 9be57c753cfa20b5b416db21144498af5f3f6338
+  metadata.gz: b64b96b50afcce28b0a42fa8e189999b09dd62e8
+  data.tar.gz: 328a0050e7219d5bf18ee11e54b9d213ca83f309
 SHA512:
-  metadata.gz: 226037b92383771a74da77abde6615cbbb3015a138431ffa80a8ef14aa462dfd2c6b7b48e23d0ebf82c5b7457985a1a3f250c01996fc4131a2469b9543d41cb6
-  data.tar.gz: f5a4a8c4bd1aecdb15abd3d64104beb8daae4ccd90402a0f663e169f0186318c8170a727d05afb14ef077eff76c11b759a42043747baff783e490bd83ac568f9
+  metadata.gz: 380ed9ccf535efa6cd30e737b69a16d5295072c39123e701baa52fd9ab82d655ac45a6b955c985006241a1c3717587d6e77f7797ecde853bc2635ca4afd16cff
+  data.tar.gz: 80da943fa0f1db2eb216327dfffec579c5f936be58153c1ca2fee19176517f0b384ff084449fb23a5bfe7d678c9c45f229a0d9bc009b3deda42271939853c518

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

@@ -3,9 +3,11 @@ package org.embulk.output.jdbc.setter;
 import java.math.BigDecimal;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class BigDecimalColumnSetter
         extends ColumnSetter
@@ -65,4 +67,10 @@ public class BigDecimalColumnSetter
     {
         defaultValue.setBigDecimal();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setBigDecimal();
+    }
 }

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

@@ -2,9 +2,11 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class BooleanColumnSetter
         extends ColumnSetter
@@ -50,4 +52,10 @@ public class BooleanColumnSetter
     {
         defaultValue.setBoolean();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setBoolean();
+    }
 }

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

@@ -3,10 +3,13 @@ package org.embulk.output.jdbc.setter;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+
 import com.google.common.math.DoubleMath;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class ByteColumnSetter
         extends ColumnSetter
@@ -72,4 +75,10 @@ public class ByteColumnSetter
     {
         defaultValue.setByte();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setByte();
+    }
 }

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

@@ -2,9 +2,11 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import org.embulk.spi.time.Timestamp;
-import org.embulk.output.jdbc.JdbcColumn;
+
 import org.embulk.output.jdbc.BatchInsert;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.spi.time.Timestamp;
+import org.msgpack.value.Value;
 
 public abstract class ColumnSetter
 {
@@ -41,4 +43,6 @@ public abstract class ColumnSetter
     public abstract void stringValue(String v) throws IOException, SQLException;
 
     public abstract void timestampValue(Timestamp v) throws IOException, SQLException;
+
+    public abstract void jsonValue(Value v) throws IOException, SQLException;
 }

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

@@ -62,6 +62,8 @@ public class ColumnSetterFactory
             return new SqlTimestampColumnSetter(batch, column, newDefaultValueSetter(column, option), newCalendar(option));
         case "decimal":
             return new BigDecimalColumnSetter(batch, column, newDefaultValueSetter(column, option));
+        case "json":
+            return new JsonColumnSetter(batch, column, newDefaultValueSetter(column, option));
         case "null":
             return new NullColumnSetter(batch, column, newDefaultValueSetter(column, option));
         case "pass":
@@ -133,6 +135,7 @@ public class ColumnSetterFactory
         case Types.NCHAR:
         case Types.NVARCHAR:
         case Types.LONGNVARCHAR:
+        case Types.NCLOB:
             return new NStringColumnSetter(batch, column, newDefaultValueSetter(column, option), newTimestampFormatter(option));
 
         // TODO

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

@@ -79,8 +79,18 @@ public class ColumnSetterVisitor
     }
 
     @Override
-    public void jsonColumn(Column column) {
-        throw new UnsupportedOperationException("This plugin doesn't support json type. Please try to upgrade version of the plugin using 'embulk gem update' command. If the latest version still doesn't support json type, please contact plugin developers, or change configuration of input plugin not to use json type.");
+    public void jsonColumn(Column column)
+    {
+        try {
+            if (pageReader.isNull(column)) {
+                setter.nullValue();
+            } else {
+                setter.jsonValue(pageReader.getJson(column));
+            }
+        } catch (IOException | SQLException ex) {
+            // TODO exception class
+            throw new RuntimeException(ex);
+        }
     }
 
     @Override

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

@@ -45,4 +45,6 @@ public abstract class DefaultValueSetter
     public abstract void setSqlTime() throws IOException, SQLException;
 
     public abstract void setSqlTimestamp() throws IOException, SQLException;
+
+    public abstract void setJson() throws IOException, SQLException;
 }

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

@@ -2,9 +2,11 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class DoubleColumnSetter
         extends ColumnSetter
@@ -57,4 +59,10 @@ public class DoubleColumnSetter
     {
         defaultValue.setDouble();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setDouble();
+    }
 }

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

@@ -2,9 +2,11 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class FloatColumnSetter
         extends ColumnSetter
@@ -57,4 +59,10 @@ public class FloatColumnSetter
     {
         defaultValue.setFloat();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setFloat();
+    }
 }

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

@@ -3,10 +3,13 @@ package org.embulk.output.jdbc.setter;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+
 import com.google.common.math.DoubleMath;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class IntColumnSetter
         extends ColumnSetter
@@ -72,4 +75,10 @@ public class IntColumnSetter
     {
         defaultValue.setInt();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setInt();
+    }
 }

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

@@ -0,0 +1,61 @@
+package org.embulk.output.jdbc.setter;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import org.embulk.spi.time.Timestamp;
+import org.embulk.output.jdbc.JdbcColumn;
+import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
+
+public class JsonColumnSetter
+        extends ColumnSetter
+{
+    public JsonColumnSetter(BatchInsert batch, JdbcColumn column,
+            DefaultValueSetter defaultValue)
+    {
+        super(batch, column, defaultValue);
+    }
+
+    @Override
+    public void nullValue() throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void booleanValue(boolean v) throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void longValue(long v) throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void doubleValue(double v) throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void stringValue(String v) throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void timestampValue(Timestamp v) throws IOException, SQLException
+    {
+        defaultValue.setJson();
+    }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException {
+        batch.setString(v.toJson());
+    }
+}
+

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

@@ -3,10 +3,13 @@ package org.embulk.output.jdbc.setter;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+
 import com.google.common.math.DoubleMath;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class LongColumnSetter
         extends ColumnSetter
@@ -68,4 +71,10 @@ public class LongColumnSetter
     {
         defaultValue.setLong();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setLong();
+    }
 }

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

@@ -2,10 +2,12 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class NStringColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class NStringColumnSetter
     {
         batch.setNString(timestampFormatter.format(v));
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setNString();
+    }
 }

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

@@ -2,9 +2,11 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class NullColumnSetter
         extends ColumnSetter
@@ -50,4 +52,10 @@ public class NullColumnSetter
     {
         defaultValue.setNull();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setNull();
+    }
 }

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

@@ -102,4 +102,10 @@ public class NullDefaultValueSetter
     {
         batch.setNull(column.getSqlType());
     }
+
+    @Override
+    public void setJson() throws IOException, SQLException
+    {
+        batch.setNull(column.getSqlType());
+    }
 }

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

@@ -3,9 +3,11 @@ package org.embulk.output.jdbc.setter;
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class PassThroughColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class PassThroughColumnSetter
     {
         batch.setSqlTimestamp(v, calendar);
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        batch.setString(v.toJson());
+    }
 }

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

@@ -3,10 +3,13 @@ package org.embulk.output.jdbc.setter;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.math.RoundingMode;
+
 import com.google.common.math.DoubleMath;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class ShortColumnSetter
         extends ColumnSetter
@@ -72,4 +75,10 @@ public class ShortColumnSetter
     {
         defaultValue.setShort();
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setShort();
+    }
 }

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

@@ -2,6 +2,7 @@ package org.embulk.output.jdbc.setter;
 
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class SkipColumnSetter
         extends ColumnSetter
@@ -40,4 +41,9 @@ public class SkipColumnSetter
     public void nullValue()
     {
     }
+
+    @Override
+    public void jsonValue(Value v)
+    {
+    }
 }

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

@@ -3,9 +3,11 @@ package org.embulk.output.jdbc.setter;
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class SqlDateColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class SqlDateColumnSetter
     {
         batch.setSqlDate(v, calendar);
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setSqlDate();
+    }
 }

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

@@ -3,9 +3,11 @@ package org.embulk.output.jdbc.setter;
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class SqlTimeColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class SqlTimeColumnSetter
     {
         batch.setSqlTime(v, calendar);
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTime();
+    }
 }

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

@@ -3,9 +3,11 @@ package org.embulk.output.jdbc.setter;
 import java.util.Calendar;
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class SqlTimestampColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class SqlTimestampColumnSetter
     {
         batch.setSqlTimestamp(v, calendar);
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        defaultValue.setSqlTimestamp();
+    }
 }

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

@@ -2,10 +2,12 @@ package org.embulk.output.jdbc.setter;
 
 import java.io.IOException;
 import java.sql.SQLException;
+
 import org.embulk.spi.time.Timestamp;
 import org.embulk.spi.time.TimestampFormatter;
 import org.embulk.output.jdbc.JdbcColumn;
 import org.embulk.output.jdbc.BatchInsert;
+import org.msgpack.value.Value;
 
 public class StringColumnSetter
         extends ColumnSetter
@@ -55,4 +57,10 @@ public class StringColumnSetter
     {
         batch.setString(timestampFormatter.format(v));
     }
+
+    @Override
+    public void jsonValue(Value v) throws IOException, SQLException
+    {
+        batch.setString(v.toJson());
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -42,6 +42,7 @@ files:
 - src/main/java/org/embulk/output/jdbc/setter/DoubleColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/FloatColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/IntColumnSetter.java
+- src/main/java/org/embulk/output/jdbc/setter/JsonColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/LongColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/NStringColumnSetter.java
 - src/main/java/org/embulk/output/jdbc/setter/NullColumnSetter.java
@@ -57,7 +58,7 @@ files:
 - src/test/java/org/embulk/output/TestJdbcOutputPlugin.java
 - src/test/java/org/embulk/output/TimestampFormatTest.java
 - src/test/java/org/embulk/output/tester/EmbulkPluginTester.java
-- classpath/embulk-output-jdbc-0.5.1.jar
+- classpath/embulk-output-jdbc-0.6.0.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0