Fixes for storing a Java byte into a SMALLINT column

Author: aguibert

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

@@ -219,16 +219,9 @@ public static boolean canConvert(Object value, int toType) {
     	if (clazz == String.class)
     		return true; 
     	switch (toType) {
-        case ClientTypes.BIGINT:
-        case ClientTypes.BIT:
-        case ClientTypes.BOOLEAN:
-        case ClientTypes.CHAR:
-        case ClientTypes.DECIMAL:
-        case ClientTypes.DOUBLE:
         case ClientTypes.INTEGER:
+        case ClientTypes.BIGINT:
         case ClientTypes.LONGVARCHAR:
-        case ClientTypes.REAL:
-        case ClientTypes.SMALLINT:
         	return clazz == boolean.class ||
         		   clazz == Boolean.class ||
         		   clazz == double.class ||
@@ -242,6 +235,30 @@ public static boolean canConvert(Object value, int toType) {
         		   clazz == short.class ||
         		   clazz == Short.class ||
         		   clazz == BigDecimal.class;
+        case ClientTypes.DOUBLE:
+        case ClientTypes.REAL:
+        case ClientTypes.DECIMAL:
+		 	return clazz == double.class ||
+		 		   clazz == Double.class ||
+		 		   clazz == float.class ||
+		 		   clazz == Float.class;
+        case ClientTypes.BIT:
+        case ClientTypes.BOOLEAN:
+        case ClientTypes.CHAR:
+        case ClientTypes.SMALLINT:
+        	return clazz == boolean.class ||
+		 		   clazz == Boolean.class ||
+		 		   clazz == char.class || 
+		 		   clazz == Character.class ||
+		 		   clazz == int.class ||
+		 		   clazz == Integer.class ||
+		 		   clazz == long.class ||
+		 		   clazz == Long.class ||
+		 		   clazz == short.class ||
+		 		   clazz == Short.class ||
+		 		   clazz == byte.class ||
+		 		   clazz == Byte.class ||
+		 		   clazz == BigDecimal.class;
         case ClientTypes.BINARY:
         case ClientTypes.BLOB:
         	return clazz == boolean.class ||

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

@@ -37,12 +37,12 @@ public class DB2DataTypeTest extends DB2TestBase {
 	 * float can still be inserted and selected from such a column
 	 */
 	@Test
-	public void testInsertFloatColumn(TestContext ctx) {
+	public void testFloatIntoFloatColumn(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")
+			         conn.query("SELECT id,test_float FROM db2_types WHERE id = 1")
 			           .execute(ctx.asyncAssertSuccess(rows -> {
 			        	   ctx.assertEquals(1, rows.size());
 			        	   Row row = rows.iterator().next();
@@ -53,6 +53,28 @@ public void testInsertFloatColumn(TestContext ctx) {
 			  }));
 	}
 
+	/**
+	 * DB2 has no BYTE or BOOLEAN column type, and instead maps it to a
+	 * 2-byte SMALLINT column type. This means Java byte types must be
+	 * converted into SMALLINT formats
+	 */
+	@Test
+	public void testByteIntoSmallIntColumn(TestContext ctx) {
+		  connect(ctx.asyncAssertSuccess(conn -> {
+			    // Insert some data
+			    conn.preparedQuery("INSERT INTO db2_types (id,test_byte) VALUES (?, ?)")
+			      .execute(Tuple.of(2, (byte) 0xCA), ctx.asyncAssertSuccess(insertResult -> {
+			         conn.query("SELECT id,test_byte FROM db2_types WHERE id = 2")
+			           .execute(ctx.asyncAssertSuccess(rows -> {
+			        	   ctx.assertEquals(1, rows.size());
+			        	   Row row = rows.iterator().next();
+			        	   ctx.assertEquals(2, row.getInteger(0));
+			        	   ctx.assertEquals((byte) 0xCA, row.get(Byte.class, 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

@@ -114,5 +114,6 @@ DROP TABLE IF EXISTS db2_types;
 CREATE TABLE db2_types
 (
     id           INT,
+    test_byte    SMALLINT,
     test_float   FLOAT
 );