fix: fix getLong on NUMERIC

Author: rayudu3745

src/main/java/com/google/cloud/spanner/jdbc/JdbcResultSet.java

@@ -307,7 +307,7 @@ public byte getByte(int columnIndex) throws SQLException {
       case ENUM:
         return isNull ? (byte) 0 : checkedCastToByte(spanner.getLong(spannerIndex));
       case NUMERIC:
-        return isNull ? (byte) 0 : checkedCastToByte(spanner.getBigDecimal(spannerIndex));
+        return isNull ? (byte) 0 : checkedCastToByte(spanner.getBigDecimal(spannerIndex).toBigInteger());
       case PG_NUMERIC:
         return isNull
             ? (byte) 0
@@ -354,7 +354,7 @@ public short getShort(int columnIndex) throws SQLException {
         }
         return isNull ? 0 : checkedCastToShort(spanner.getLong(spannerIndex));
       case NUMERIC:
-        return isNull ? 0 : checkedCastToShort(spanner.getBigDecimal(spannerIndex));
+        return isNull ? (short) 0 : checkedCastToShort(spanner.getBigDecimal(spannerIndex).toBigInteger());
       case PG_NUMERIC:
         return isNull
             ? 0
@@ -395,7 +395,7 @@ public int getInt(int columnIndex) throws SQLException {
       case ENUM:
         return isNull ? 0 : checkedCastToInt(spanner.getLong(spannerIndex));
       case NUMERIC:
-        return isNull ? 0 : checkedCastToInt(spanner.getBigDecimal(spannerIndex));
+        return isNull ? 0 : checkedCastToInt(spanner.getBigDecimal(spannerIndex).toBigInteger());
       case PG_NUMERIC:
         return isNull
             ? 0
@@ -432,7 +432,7 @@ public long getLong(int columnIndex) throws SQLException {
       case ENUM:
         return isNull ? 0L : spanner.getLong(spannerIndex);
       case NUMERIC:
-        return isNull ? 0 : checkedCastToLong(parseBigDecimal(spanner.getString(spannerIndex)));
+        return isNull ? 0L : checkedCastToLong(spanner.getBigDecimal(spannerIndex).toBigInteger());
       case PG_NUMERIC:
         return isNull
             ? 0L

src/main/java/com/google/cloud/spanner/jdbc/JdbcTypeConverter.java

@@ -127,28 +127,28 @@ static Object convert(Object value, Type type, Class<?> targetType) throws SQLEx
         if (type.getCode() == Code.BOOL) return (Boolean) value ? 1L : 0L;
         if (type.getCode() == Code.INT64 || type.getCode() == Code.ENUM) return value;
         if (type.getCode() == Code.NUMERIC)
-          return AbstractJdbcWrapper.checkedCastToLong((BigDecimal) value);
+          return AbstractJdbcWrapper.checkedCastToLong(((BigDecimal) value).toBigInteger());
       }
       if (targetType.equals(Integer.class)) {
         if (type.getCode() == Code.BOOL) return (Boolean) value ? 1 : 0;
         if (type.getCode() == Code.INT64 || type.getCode() == Code.ENUM)
           return AbstractJdbcWrapper.checkedCastToInt((Long) value);
         if (type.getCode() == Code.NUMERIC)
-          return AbstractJdbcWrapper.checkedCastToInt((BigDecimal) value);
+          return AbstractJdbcWrapper.checkedCastToInt(((BigDecimal) value).toBigInteger());
       }
       if (targetType.equals(Short.class)) {
         if (type.getCode() == Code.BOOL) return (Boolean) value ? 1 : 0;
         if (type.getCode() == Code.INT64 || type.getCode() == Code.ENUM)
           return AbstractJdbcWrapper.checkedCastToShort((Long) value);
         if (type.getCode() == Code.NUMERIC)
-          return AbstractJdbcWrapper.checkedCastToShort((BigDecimal) value);
+          return AbstractJdbcWrapper.checkedCastToShort(((BigDecimal) value).toBigInteger());
       }
       if (targetType.equals(Byte.class)) {
         if (type.getCode() == Code.BOOL) return (Boolean) value ? 1 : 0;
         if (type.getCode() == Code.INT64 || type.getCode() == Code.ENUM)
           return AbstractJdbcWrapper.checkedCastToByte((Long) value);
         if (type.getCode() == Code.NUMERIC)
-          return AbstractJdbcWrapper.checkedCastToByte((BigDecimal) value);
+          return AbstractJdbcWrapper.checkedCastToByte(((BigDecimal) value).toBigInteger());
       }
       if (targetType.equals(BigInteger.class)) {
         if (type.getCode() == Code.BOOL) return (Boolean) value ? BigInteger.ONE : BigInteger.ZERO;

src/test/java/com/google/cloud/spanner/jdbc/JdbcResultSetTest.java

@@ -594,6 +594,29 @@ public void testGetLongIndexForFloat64() throws SQLException {
     assertTrue(subject.wasNull());
   }
 
+  @Test
+  public void testGetIntegerTypesOnNumeric() throws SQLException {
+    assertEquals((byte) 0, subject.getByte(NUMERIC_COLINDEX_NULL));
+    assertTrue(subject.wasNull());
+    assertEquals((byte) 3, subject.getByte(NUMERIC_COLINDEX_NOTNULL));
+    assertFalse(subject.wasNull());
+
+    assertEquals((short) 0, subject.getShort(NUMERIC_COLINDEX_NULL));
+    assertTrue(subject.wasNull());
+    assertEquals((short) 3, subject.getShort(NUMERIC_COLINDEX_NOTNULL));
+    assertFalse(subject.wasNull());
+
+    assertEquals(0, subject.getInt(NUMERIC_COLINDEX_NULL));
+    assertTrue(subject.wasNull());
+    assertEquals(3, subject.getInt(NUMERIC_COLINDEX_NOTNULL));
+    assertFalse(subject.wasNull());
+
+    assertEquals(0L, subject.getLong(NUMERIC_COLINDEX_NULL));
+    assertTrue(subject.wasNull());
+    assertEquals(3L, subject.getLong(NUMERIC_COLINDEX_NOTNULL));
+    assertFalse(subject.wasNull());
+  }
+
   @Test
   public void testGetLongIndexForString() {
     try {