remove UInt from JDBC type mapping

Author: gfunc

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcUtils.java

@@ -40,11 +40,8 @@ public class JdbcUtils {
     private static Map<ClickHouseDataType, SQLType> generateTypeMap() {
         Map<ClickHouseDataType, SQLType> map = new TreeMap<>(); // TreeMap is used to sort the keys in natural order so FixedString will be before String :-) (type match should be more accurate)
         map.put(ClickHouseDataType.Int8, JDBCType.TINYINT);
-        map.put(ClickHouseDataType.UInt8, JDBCType.TINYINT);
         map.put(ClickHouseDataType.Int16, JDBCType.SMALLINT);
-        map.put(ClickHouseDataType.UInt16, JDBCType.SMALLINT);
         map.put(ClickHouseDataType.Int32, JDBCType.INTEGER);
-        map.put(ClickHouseDataType.UInt32, JDBCType.BIGINT);
         map.put(ClickHouseDataType.Int64, JDBCType.BIGINT);
         map.put(ClickHouseDataType.Float32, JDBCType.FLOAT);
         map.put(ClickHouseDataType.Float64, JDBCType.DOUBLE);

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -92,7 +92,7 @@ public void testIntegerTypes() throws SQLException {
         long int64 = rand.nextLong();
         BigInteger int128 = new BigInteger(127, rand);
         BigInteger int256 = new BigInteger(255, rand);
-        int uint8 = rand.nextInt(256);
+        Short uint8 = Integer.valueOf(rand.nextInt(256)).shortValue();
         int uint16 = rand.nextInt(65536);
         long uint32 = rand.nextInt() & 0xFFFFFFFFL;
         BigInteger uint64 = BigInteger.valueOf(rand.nextLong(Long.MAX_VALUE));
@@ -179,7 +179,7 @@ public void testIntegerTypes() throws SQLException {
                     assertEquals(rs.getObject("int64"), -9223372036854775808L);
                     assertEquals(rs.getObject("int128"), new BigInteger("-170141183460469231731687303715884105728"));
                     assertEquals(rs.getObject("int256"), new BigInteger("-57896044618658097711785492504343953926634992332820282019728792003956564819968"));
-                    assertEquals(rs.getObject("uint8"), 0);
+                    assertEquals(rs.getObject("uint8"), Short.valueOf("0"));
                     assertEquals(rs.getObject("uint16"), 0);
                     assertEquals(rs.getObject("uint32"), 0L);
                     assertEquals(rs.getObject("uint64"), new BigInteger("0"));
@@ -193,7 +193,7 @@ public void testIntegerTypes() throws SQLException {
                     assertEquals(rs.getObject("int64"), 9223372036854775807L);
                     assertEquals(rs.getObject("int128"), new BigInteger("170141183460469231731687303715884105727"));
                     assertEquals(rs.getObject("int256"), new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564819967"));
-                    assertEquals(rs.getObject("uint8"), 255);
+                    assertEquals(rs.getObject("uint8"), Short.valueOf("255"));
                     assertEquals(rs.getObject("uint16"), 65535);
                     assertEquals(rs.getObject("uint32"), 4294967295L);
                     assertEquals(rs.getObject("uint64"), new BigInteger("18446744073709551615"));