embulk-input-jdbc 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04a66446f33cb93478fac400edddfde76fc16a3b
-  data.tar.gz: b8bcffe863fa757da3124c6a6d9b82b317d0662f
+  metadata.gz: ef30f93f35dcbdd6db4b36511bf5f75b883a1ec6
+  data.tar.gz: e0b9ea62c7511c819633d6ae91f54fa61403bcd4
 SHA512:
-  metadata.gz: f20fedd3f5d22ac57067b83e4dbd6038c5f69acca74a810af84934e1a988dd5acc3ae16afe960324f929a37e2c7bbbd8e6194de4f1195632446001a5915d78ee
-  data.tar.gz: 4176be4dafda7373475ccd04e198ed27c809b1853590617ac10f3da1c058082ea61169bff33791f0f431ccdfb8ee46b564ebe96c312a22382877354ece647e04
+  metadata.gz: 8ebe087f0a16081df0bc640b2916661357e41190bcaaa7c4b0bf6bec80dba033bbc740a670893f8b8f49699effb0ab93caf8bd290eda838c9c91f85a65941f95
+  data.tar.gz: e560eb0880aca36c5bde61c17e1f80ff64fcd4c2a4c619402e2d3a1983c1d533de786a9f75fe98e35e0e63dcb34332d7bd8916721a26caa485ca2eb1d128ca16

data/src/main/java/org/embulk/input/jdbc/getter/ColumnGetterFactory.java

@@ -9,6 +9,7 @@ import org.embulk.input.jdbc.getter.ColumnGetters.StringColumnGetter;
 import org.embulk.input.jdbc.getter.ColumnGetters.DateColumnGetter;
 import org.embulk.input.jdbc.getter.ColumnGetters.TimeColumnGetter;
 import org.embulk.input.jdbc.getter.ColumnGetters.TimestampColumnGetter;
+import org.embulk.input.jdbc.getter.ColumnGetters.BigDecimalToDoubleColumnGetter;
 
 public class ColumnGetterFactory
 {
@@ -22,18 +23,18 @@ public class ColumnGetterFactory
         case Types.BIGINT:
             return new LongColumnGetter();
 
-        // setDouble
+        // getDouble
         case Types.DOUBLE:
         case Types.FLOAT:
         case Types.REAL:
             return new DoubleColumnGetter();
 
-        // setBool
+        // getBool
         case Types.BOOLEAN:
         case Types.BIT:  // JDBC BIT is boolean, unlike SQL-92
             return new BooleanColumnGetter();
 
-        // setString, Clob
+        // getString, Clob
         case Types.CHAR:
         case Types.VARCHAR:
         case Types.LONGVARCHAR:
@@ -44,7 +45,7 @@ public class ColumnGetterFactory
             return new StringColumnGetter();
 
         // TODO
-        //// setBytes Blob
+        //// getBytes Blob
         //case Types.BINARY:
         //case Types.VARBINARY:
         //case Types.LONGVARBINARY:
@@ -68,11 +69,10 @@ public class ColumnGetterFactory
         //case Types.NULL:
         //    return new NullColumnGetter();
 
-        // TODO
-        //// BigDecimal
-        //case Types.NUMERIC:
-        //case Types.DECIMAL:
-        //    return new BigDecimalColumnGetter();
+        // getBigDecimal
+        case Types.NUMERIC:
+        case Types.DECIMAL:
+            return new BigDecimalToDoubleColumnGetter();
 
         // others
         case Types.ARRAY:  // array
@@ -92,8 +92,7 @@ public class ColumnGetterFactory
     private static UnsupportedOperationException unsupportedOperationException(JdbcColumn column)
     {
         throw new UnsupportedOperationException(
-                String.format("Unsupported type %s (sqlType=%d)",
-                    column.getTypeName(), column.getSqlType()));
+                String.format("Unsupported type %s (sqlType=%d) of '%s' column. Please exclude the column from 'select:' option.",
+                    column.getTypeName(), column.getSqlType(), column.getName()));
     }
 }
-

data/src/main/java/org/embulk/input/jdbc/getter/ColumnGetters.java

@@ -2,6 +2,7 @@ package org.embulk.input.jdbc.getter;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.math.BigDecimal;
 import org.embulk.spi.Column;
 import org.embulk.spi.PageBuilder;
 import org.embulk.spi.Column;
@@ -169,4 +170,28 @@ public class ColumnGetters
             return Types.TIMESTAMP.withFormat("%Y-%m-%d %H:%M:%S");
         }
     }
+
+    public static class BigDecimalToDoubleColumnGetter
+            implements ColumnGetter
+    {
+        @Override
+        public void getAndSet(ResultSet from, int fromIndex,
+                PageBuilder to, Column toColumn) throws SQLException
+        {
+            BigDecimal v = from.getBigDecimal(fromIndex);
+            if (from.wasNull()) {
+                to.setNull(toColumn);
+            } else {
+                // rounded value could be Double.NEGATIVE_INFINITY or Double.POSITIVE_INFINITY.
+                double rounded = v.doubleValue();
+                to.setDouble(toColumn, rounded);
+            }
+        }
+
+        @Override
+        public Type getToType()
+        {
+            return Types.DOUBLE;
+        }
+    }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-jdbc
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - FURUHASHI Sadayuki
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies: []
 description: JDBC input plugin is an Embulk plugin that loads records from JDBC so that any output plugins can receive the records. Search the output plugins by "embulk-output" keyword.
 email:
@@ -26,7 +26,7 @@ files:
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetter.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetterFactory.java
 - src/main/java/org/embulk/input/jdbc/getter/ColumnGetters.java
-- classpath/embulk-input-jdbc-0.2.0.jar
+- classpath/embulk-input-jdbc-0.2.1.jar
 homepage: https://github.com/embulk/embulk-input-jdbc
 licenses:
 - Apache 2.0