Fix issue encoding a Java float into a DB2 FLOAT column type

Author: aguibert

vertx-db2-client/src/main/java/io/vertx/db2client/impl/drda/DRDAQueryRequest.java

@@ -707,20 +707,20 @@ private void buildFDODTA(int[][] protocolTypesAndLengths, Object[] inputs) {
                         buffer.writeBoolean(((Boolean) inputs[i]).booleanValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NINTEGER:
-                        buffer.writeInt(((Integer) inputs[i]).intValue());
+                        buffer.writeInt(((Number) inputs[i]).intValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NSMALL:
                         if (inputs[i] instanceof Boolean) {
                           buffer.writeShort(((boolean) inputs[i]) ? 1 : 0);
                         } else {
-                          buffer.writeShort(((Short) inputs[i]).shortValue());
+                          buffer.writeShort(((Number) inputs[i]).shortValue());
                         }
                         break;
                     case DRDAConstants.DRDA_TYPE_NFLOAT4:
-                        buffer.writeFloat(((Float) inputs[i]).floatValue());
+                        buffer.writeFloat(((Number) inputs[i]).floatValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NFLOAT8:
-                        buffer.writeDouble(((Double) inputs[i]).doubleValue());
+                        buffer.writeDouble(((Number) inputs[i]).doubleValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NDECIMAL:
                         writeBigDecimal((BigDecimal) inputs[i], (protocolTypesAndLengths[i][1] >> 8) & 0xff, // described precision not actual

vertx-db2-client/src/test/java/io/vertx/db2client/DB2DataTypeTest.java

@@ -31,6 +31,28 @@
 @RunWith(VertxUnitRunner.class)
 public class DB2DataTypeTest extends DB2TestBase {
 
+	/**
+	 * In DB2 the FLOAT and DOUBLE column types both map to an 8-byte 
+	 * double-precision column (i.e. Java double). Ensure that a Java
+	 * float can still be inserted and selected from such a column
+	 */
+	@Test
+	public void testInsertFloatColumn(TestContext ctx) {
+		  connect(ctx.asyncAssertSuccess(conn -> {
+			    // Insert some data
+			    conn.preparedQuery("INSERT INTO db2_types (id,test_float) VALUES (?, ?)")
+			      .execute(Tuple.of(1, 5.0f), ctx.asyncAssertSuccess(insertResult -> {
+			         conn.query("SELECT * FROM db2_types WHERE id = 1")
+			           .execute(ctx.asyncAssertSuccess(rows -> {
+			        	   ctx.assertEquals(1, rows.size());
+			        	   Row row = rows.iterator().next();
+			        	   ctx.assertEquals(1, row.getInteger(0));
+			        	   ctx.assertEquals(5.0f, row.getFloat(1));
+			           }));
+			      }));
+			  }));
+	}
+	
 	@Test
 	public void testRowId(TestContext ctx) {
 	  assumeTrue("Only DB2/Z supports the ROWID column type", rule.isZOS());

vertx-db2-client/src/test/resources/init.sql

@@ -108,3 +108,11 @@ INSERT INTO collector_test VALUES (2, 32767, 2147483647, 9223372036854775807, 12
 -- Sequence used by QueryVariationsTest
 DROP SEQUENCE my_seq;
 CREATE SEQUENCE my_seq INCREMENT BY 1 START WITH 1;
+
+-- used by DB2DataTypeTest
+DROP TABLE IF EXISTS db2_types;
+CREATE TABLE db2_types
+(
+    id           INT,
+    test_float   FLOAT
+);

vertx-db2-client/src/test/resources/init.zos.sql

@@ -115,6 +115,14 @@ CREATE TABLE ROWTEST(
     message varchar(1024)
 );
 
+-- used by DB2DataTypeTest
+DROP TABLE IF EXISTS db2_types;
+CREATE TABLE db2_types
+(
+    id           INT,
+    test_float   FLOAT
+);
+
 -- Sequence used by QueryVariationsTest
 DROP SEQUENCE my_seq;
 CREATE SEQUENCE my_seq INCREMENT BY 1 START WITH 1;