embulk-output-jdbc 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d53fa63e0610150767ab330b29bf436707ed8ef
-  data.tar.gz: cca3319be7428f46e64c76abb47caf9cc03edb8a
+  metadata.gz: f31cfd6a9ac7188988b1e114f160db42d04e32f8
+  data.tar.gz: 735cb79d17704d1ae1074bf3a6b225a7090844df
 SHA512:
-  metadata.gz: 188f1e9a3acc891c531ea531b2d7dac8c31070a2efe85645116bec8f1def2ce2380c743bf40e4001f2ddb96826322ac32c134a63c9a6afe87ca5993d3fef068f
-  data.tar.gz: bb9836e2bc55673a5943ff955d2046812bbeacf84984aa1cfed7b053ea4b4d14a5b3c9c41db1a7f24c08962e08515647e28d8515fa851cceeccaff35b2e58dec
+  metadata.gz: 2fb168e80e969473bdde51f392177f2ca1777c47512991bfa3b5cb0a592325af531d37a1290a0d84e08b1f478fccc273050c29543782829cb720ea201a73989c
+  data.tar.gz: 5f568dd31653c80dd2f8c86290dc0a754a571b5fd45f5efcf4436e4aecb3df590e50c5737953273bfecbb28281737c60993f73a2de2aba0106e4d0b63406972c

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

@@ -717,10 +717,11 @@ public abstract class AbstractJdbcOutputPlugin
                 if (rs.wasNull()) {
                     decDigit = -1;
                 }
+                int charOctetLength = rs.getInt("CHAR_OCTET_LENGTH");
                 boolean isNotNull = "NO".equals(rs.getString("IS_NULLABLE"));
                 //rs.getString("COLUMN_DEF") // or null  // TODO
                 builder.add(JdbcColumn.newGenericTypeColumn(
-                            columnName, sqlType, simpleTypeName, colSize, decDigit, isNotNull, isUniqueKey));
+                            columnName, sqlType, simpleTypeName, colSize, decDigit, charOctetLength, isNotNull, isUniqueKey));
                 // We can't get declared column name using JDBC API.
                 // Subclasses need to overwrite it.
             }

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

@@ -12,6 +12,7 @@ public class JdbcColumn
     private final int sqlType;
     private final int sizeTypeParameter;
     private final int scaleTypeParameter;
+    private final int dataLength;
     private final Optional<String> declaredType;
     private final boolean isNotNull;
     private final boolean isUniqueKey;
@@ -23,6 +24,7 @@ public class JdbcColumn
             @JsonProperty("simpleTypeName") String simpleTypeName,
             @JsonProperty("sizeTypeParameter") int sizeTypeParameter,
             @JsonProperty("scaleTypeParameter") int scaleTypeParameter,
+            @JsonProperty("dataLength") int dataLength,
             @JsonProperty("declaredType") Optional<String> declaredType,
             @JsonProperty("notNull") boolean isNotNull,
             @JsonProperty("uniqueKey") boolean isUniqueKey)
@@ -32,32 +34,42 @@ public class JdbcColumn
         this.sqlType = sqlType;
         this.sizeTypeParameter = sizeTypeParameter;
         this.scaleTypeParameter = scaleTypeParameter;
+        this.dataLength = dataLength;
         this.declaredType = declaredType;
         this.isNotNull = isNotNull;
         this.isUniqueKey = isUniqueKey;
     }
 
+    public static JdbcColumn newGenericTypeColumn(String name, int sqlType,
+            String simpleTypeName, int sizeTypeParameter, int scaleTypeParameter, int dataLength,
+            boolean isNotNull, boolean isUniqueKey)
+    {
+        return new JdbcColumn(name, sqlType,
+                simpleTypeName, sizeTypeParameter, scaleTypeParameter, dataLength,
+                Optional.<String>absent(), isNotNull, isUniqueKey);
+    }
+
     public static JdbcColumn newGenericTypeColumn(String name, int sqlType,
             String simpleTypeName, int sizeTypeParameter, int scaleTypeParameter,
             boolean isNotNull, boolean isUniqueKey)
     {
         return new JdbcColumn(name, sqlType,
-                simpleTypeName, sizeTypeParameter, scaleTypeParameter, Optional.<String>absent(),
-                isNotNull, isUniqueKey);
+                simpleTypeName, sizeTypeParameter, scaleTypeParameter, sizeTypeParameter,
+                Optional.<String>absent(), isNotNull, isUniqueKey);
     }
 
     public static JdbcColumn newTypeDeclaredColumn(String name, int sqlType,
             String declaredType, boolean isNotNull, boolean isUniqueKey)
     {
         return new JdbcColumn(name, sqlType,
-                declaredType, 0, 0, Optional.of(declaredType),
-                isNotNull, isUniqueKey);
+                declaredType, 0, 0, 0,
+                Optional.of(declaredType), isNotNull, isUniqueKey);
     }
 
     @JsonIgnore
     public static JdbcColumn skipColumn()
     {
-        return new JdbcColumn(null, 0, null, 0, 0, Optional.<String>absent(), false, false);
+        return new JdbcColumn(null, 0, null, 0, 0, 0, Optional.<String>absent(), false, false);
     }
 
     @JsonIgnore
@@ -96,6 +108,12 @@ public class JdbcColumn
         return scaleTypeParameter;
     }
 
+    @JsonProperty("dataLength")
+    public int getDataLength()
+    {
+        return dataLength;
+    }
+
     @JsonProperty("declaredType")
     public Optional<String> getDeclaredType()
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-output-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies: []
 description: Inserts or updates records to a table.
 email:
@@ -53,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.4.3.jar
+- classpath/embulk-output-jdbc-0.4.4.jar
 homepage: https://github.com/embulk/embulk-output-jdbc
 licenses:
 - Apache 2.0