Merge pull request #2334 from gfunc/main

[jdbc-v2] bug fix for UInt32 UInt64 and Added support for Nested Type

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java

@@ -234,6 +234,8 @@ public <T> T readValue(ClickHouseColumn column, Class<?> typeHint) throws IOExce
                     return (T) readVariant(actualColumn);
                 case Dynamic:
                     return (T) readValue(actualColumn, typeHint);
+                case Nested:
+                    return convertArray(readNested(actualColumn), typeHint);
                 default:
                     throw new IllegalArgumentException("Unsupported data type: " + actualColumn.getDataType());
             }
@@ -785,6 +787,33 @@ public Object[] readTuple(ClickHouseColumn column) throws IOException {
         return tuple;
     }
 
+    /**
+     * Reads a nested into an ArrayValue object.
+     * @param column - column information
+     * @return array value
+     * @throws IOException when IO error occurs
+     */
+    public ArrayValue readNested(ClickHouseColumn column) throws IOException {
+        int len = readVarInt(input);
+        if (len == 0) {
+            return new ArrayValue(Object[].class, 0);
+        }
+
+        ArrayValue array;
+        array = new ArrayValue(Object[].class, len);
+        for (int i = 0; i < len; i++) {
+            int tupleLen = column.getNestedColumns().size();
+            Object[] tuple = new Object[tupleLen];
+            for (int j = 0; j < tupleLen; j++) {
+                tuple[j] = readValue(column.getNestedColumns().get(j));
+            }
+
+            array.set(i, tuple);
+        }
+
+        return array;
+    }
+
     public Object readVariant(ClickHouseColumn column) throws IOException {
         int ordNum = readByte();
         return readValue(column.getNestedColumns().get(ordNum));

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -556,7 +556,6 @@ private void addQueryParams(URIBuilder req, Map<String, String> chConfig, Map<St
         Collection<String> sessionRoles = (Collection<String>) requestConfig.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(),
                 ClientConfigProperties.valuesFromCommaSeparated(chConfiguration.getOrDefault(ClientConfigProperties.SESSION_DB_ROLES.getKey(), "")));
         if (!sessionRoles.isEmpty()) {
-
             sessionRoles.forEach(r -> req.addParameter(ClickHouseHttpProto.QPARAM_ROLE, r));
         }
 

jdbc-v2/src/main/java/com/clickhouse/jdbc/StatementImpl.java

@@ -382,7 +382,8 @@ public boolean executeImpl(String sql, StatementType type, QuerySettings setting
             //USE Database
             List<String> tokens = JdbcUtils.tokenizeSQL(sql);
             this.schema = tokens.get(1).replace("\"", "");
-            LOG.debug("Changed statement schema {}", schema);
+            connection.setSchema(schema);
+            LOG.debug("Changed statement schema to {}", schema);
             return false;
         } else {
             executeUpdateImpl(sql, type, settings);

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

@@ -40,13 +40,9 @@ 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.INTEGER);
         map.put(ClickHouseDataType.Int64, JDBCType.BIGINT);
-        map.put(ClickHouseDataType.UInt64, JDBCType.BIGINT);
         map.put(ClickHouseDataType.Float32, JDBCType.FLOAT);
         map.put(ClickHouseDataType.Float64, JDBCType.DOUBLE);
         map.put(ClickHouseDataType.Bool, JDBCType.BOOLEAN);