Support row.getDouble and NUMERIC type.

alaisi · alaisi · commit e9fc76fc397c · 2015-11-26T22:08:53.000+02:00
diff --git a/src/main/java/com/github/pgasync/Row.java b/src/main/java/com/github/pgasync/Row.java
@@ -60,6 +60,10 @@ public interface Row {
 
     BigDecimal getBigDecimal(String column);
 
+    Double getDouble(int index);
+
+    Double getDouble(String column);
+
     Date getDate(int index);
 
     Date getDate(String column);
diff --git a/src/main/java/com/github/pgasync/impl/PgRow.java b/src/main/java/com/github/pgasync/impl/PgRow.java
@@ -135,6 +135,17 @@ public BigDecimal getBigDecimal(String column) {
         return dataConverter.toBigDecimal(pgColumn.type, data.getValue(pgColumn.index));
     }
 
+    @Override
+    public Double getDouble(int index) {
+        return dataConverter.toDouble(pgColumns[index].type, data.getValue(index));
+    }
+
+    @Override
+    public Double getDouble(String column) {
+        PgColumn pgColumn = getColumn(column);
+        return dataConverter.toDouble(pgColumn.type, data.getValue(pgColumn.index));
+    }
+
     @Override
     public Date getDate(int index) {
         return dataConverter.toDate(pgColumns[index].type, data.getValue(index));
diff --git a/src/main/java/com/github/pgasync/impl/conversion/DataConverter.java b/src/main/java/com/github/pgasync/impl/conversion/DataConverter.java
@@ -50,6 +50,9 @@ public BigInteger toBigInteger(Oid oid, byte[] value) {
     public BigDecimal toBigDecimal(Oid oid, byte[] value) {
         return value == null ? null : NumericConversions.toBigDecimal(oid, value);
     }
+    public Double toDouble(Oid oid, byte[] value) {
+        return value == null ? null : NumericConversions.toDouble(oid, value);
+    }
     public Date toDate(Oid oid, byte[] value) {
         return value == null ? null : TemporalConversions.toDate(oid, value);
     }
diff --git a/src/main/java/com/github/pgasync/impl/conversion/NumericConversions.java b/src/main/java/com/github/pgasync/impl/conversion/NumericConversions.java
@@ -72,11 +72,31 @@ static BigInteger toBigInteger(Oid oid, byte[] value) {
     static BigDecimal toBigDecimal(Oid oid, byte[] value) {
         switch (oid) {
             case UNSPECIFIED: // fallthrough
+            case INT2: // fallthrough
+            case INT4: // fallthrough
+            case INT8: // fallthrough
+            case NUMERIC: // fallthrough
             case FLOAT4: // fallthrough
             case FLOAT8:
                 return new BigDecimal(new String(value, UTF_8));
             default:
                 throw new SqlException("Unsupported conversion " + oid.name() + " -> BigDecimal");
         }
     }
+
+    static Double toDouble(Oid oid, byte[] value) {
+        switch (oid) {
+            case UNSPECIFIED: // fallthrough
+            case INT2: // fallthrough
+            case INT4: // fallthrough
+            case INT8: // fallthrough
+            case NUMERIC: // fallthrough
+            case FLOAT4: // fallthrough
+            case FLOAT8:
+                return Double.valueOf(new String(value, UTF_8));
+            default:
+                throw new SqlException("Unsupported conversion " + oid.name() + " -> BigDecimal");
+        }
+    }
+
 }
diff --git a/src/test/java/com/github/pgasync/impl/TypeConverterTest.java b/src/test/java/com/github/pgasync/impl/TypeConverterTest.java
@@ -141,6 +141,21 @@ public void shouldConvertFloat4ToBigDecimal() {
         assertEquals(new BigDecimal("789.01"), dbr.query("select 789.01::FLOAT4 as sum").row(0).getBigDecimal("sum"));
     }
 
+    @Test
+    public void shouldConvertNumericToBigDecimal() {
+        assertEquals(new BigDecimal("1223423.01"), dbr.query("select 1223423.01::NUMERIC as sum").row(0).getBigDecimal("sum"));
+    }
+
+    @Test
+    public void shouldConvertFloat4ToDouble() {
+        assertEquals((Double) 1223420.0, dbr.query("select 1223420.0::FLOAT4 as sum").row(0).getDouble("sum"));
+    }
+
+    @Test
+    public void shouldConvertNumericToDouble() {
+        assertEquals((Double) 1223423.01, dbr.query("select 1223423.01::NUMERIC as sum").row(0).getDouble("sum"));
+    }
+
     @Test
     public void shouldConvertDateToDate() {
         assertEquals(new Date(millis(2014, 1, 31, 0, 0, 0, 0)),

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,9 @@ public BigInteger toBigInteger(Oid oid, byte[] value) {`
`50`	`50`	`public BigDecimal toBigDecimal(Oid oid, byte[] value) {`
`51`	`51`	`return value == null ? null : NumericConversions.toBigDecimal(oid, value);`
`52`	`52`	`}`
	`53`	`+ public Double toDouble(Oid oid, byte[] value) {`
	`54`	`+ return value == null ? null : NumericConversions.toDouble(oid, value);`
	`55`	`+ }`
`53`	`56`	`public Date toDate(Oid oid, byte[] value) {`
`54`	`57`	`return value == null ? null : TemporalConversions.toDate(oid, value);`
`55`	`58`	`}`