Fix DB2 conversions for decimal and long integer values (#1308)

See #1303

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

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

@@ -22,7 +22,6 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.Arrays;
 import java.util.UUID;
 
 import io.netty.buffer.ByteBuf;
@@ -287,7 +286,14 @@ public static boolean canConvert(Object value, int toType) {
             clazz == Double.class ||
             clazz == float.class ||
             clazz == Float.class ||
-            clazz == BigDecimal.class;
+            clazz == int.class ||
+            clazz == Integer.class ||
+            clazz == long.class ||
+            clazz == Long.class ||
+            clazz == short.class ||
+            clazz == Short.class ||
+            clazz == BigDecimal.class ||
+            clazz == BigInteger.class;
         case ClientTypes.BIT:
         case ClientTypes.BOOLEAN:
         case ClientTypes.SMALLINT:

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

@@ -59,9 +59,9 @@ public DRDAQueryRequest(ByteBuf buffer, ConnectionMetaData metadata) {
     public static boolean isQuery(String sql) {
       if (sql != null) {
         String trimmedLower = sql.trim().toLowerCase();
-        
+
         //Remove any comments at the start
-        while (trimmedLower.startsWith("/*")) {          
+        while (trimmedLower.startsWith("/*")) {
           int count = 1;
           int position = trimmedLower.indexOf("/*")+2;
           while (count != 0) {
@@ -76,7 +76,7 @@ else if ((trimmedLower.indexOf("*/",position) > 0 && trimmedLower.indexOf("/*",p
             }
             else { //Only possible if there are no more /* or */ in which case the whole string is a comment
               throw new IllegalArgumentException("SQLState.NO_TOKENS_IN_SQL_TEXT");
-            }        
+            }
           }
           trimmedLower = trimmedLower.substring(position).trim();
         }
@@ -787,7 +787,7 @@ private void buildFDODTA(int[][] protocolTypesAndLengths, Object[] inputs) {
                         }
                         break;
                     case DRDAConstants.DRDA_TYPE_NINTEGER8:
-                        buffer.writeLong(((Long) inputs[i]).longValue());
+                      buffer.writeLong(((Number) inputs[i]).longValue());
                         break;
                     case DRDAConstants.DRDA_TYPE_NROWID:
                         RowId rowId = (RowId) inputs[i];

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

@@ -0,0 +1,26 @@
+package io.vertx.db2client;
+
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.sqlclient.Row;
+import io.vertx.sqlclient.Tuple;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class DB2QueriesTest extends DB2TestBase {
+
+  @Test
+  public void testRowNumber(TestContext ctx) {
+    connect(ctx.asyncAssertSuccess(conn -> {
+      conn.preparedQuery("SELECT * FROM (" +
+          "SELECT id, message, row_number() OVER (ORDER BY id) rn FROM immutable" +
+          ") r_0_ WHERE r_0_.rn <= ? + ? AND r_0_.rn > ? ORDER BY r_0_.rn").execute(Tuple.of(1, 1, 1))
+        .onComplete(ctx.asyncAssertSuccess(rows -> {
+          ctx.assertEquals(1, rows.size());
+          ctx.assertEquals(2, rows.iterator().next().getInteger("rn"));
+          conn.close();
+        }));
+    }));
+  }
+}