added sub-column logic to JSON columns. added test for JSON with different definition

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java

@@ -72,6 +72,7 @@ public final class ClickHouseColumn implements Serializable {
     private static final String KEYWORD_MAP = ClickHouseDataType.Map.name();
     private static final String KEYWORD_NESTED = ClickHouseDataType.Nested.name();
     private static final String KEYWORD_VARIANT = ClickHouseDataType.Variant.name();
+    private static final String KEYWORD_JSON = ClickHouseDataType.JSON.name();
 
     private int columnCount;
     private int columnIndex;
@@ -504,6 +505,21 @@ protected static int readColumn(String args, int startIndex, int len, String nam
                     }
                 }
             }
+        } else if (args.startsWith(KEYWORD_JSON, i)) {
+            int index = args.indexOf('(', i + KEYWORD_JSON.length());
+            if (index < i) {
+                throw new IllegalArgumentException(ERROR_MISSING_NESTED_TYPE);
+            }
+            i = ClickHouseUtils.skipBrackets(args, index, len, '(');
+            String originalTypeName = args.substring(startIndex, i);
+            List<ClickHouseColumn> nestedColumns = parse(args.substring(index + 1, i - 1));
+            if (nestedColumns.isEmpty()) {
+                throw new IllegalArgumentException("Nested should have at least one nested column");
+            }
+            column = new ClickHouseColumn(ClickHouseDataType.JSON, name, originalTypeName, nullable, lowCardinality,
+                    null, nestedColumns);
+            fixedLength = false;
+            estimatedLength++;
         }
 
         if (column == null) {

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -7,11 +7,14 @@
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.DataTypeUtils;
 import com.clickhouse.client.api.command.CommandSettings;
+import com.clickhouse.client.api.data_formats.ClickHouseBinaryFormatReader;
+import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertSettings;
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QueryResponse;
+import com.clickhouse.client.api.sql.SQLUtils;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.ClickHouseVersion;
 import lombok.AllArgsConstructor;
@@ -874,6 +877,38 @@ private void testVariantWith(String withWhat, String[] fields, Object[] values,
         }
     }
 
+    @Test(groups = {"integration"}, dataProvider = "testJSONBinaryFormat_dp")
+    public void testJSONBinaryFormat(String jsonDef) throws Exception {
+        if (isVersionMatch("(,24.8]")) {
+            return;
+        }
+
+        final String table = "test_json_binary_format";
+        final String jsonCol = "value " + jsonDef;
+        final String jsonValue = "{\"count\": 1000, \"stat\": {\"float\": 0.999, \"name\": \"temp\" }}";
+
+        client.execute("DROP TABLE IF EXISTS " + table).get().close();
+        client.execute(tableDefinition(table, jsonCol)).get().close();
+        client.execute("INSERT INTO " + table + " VALUES (" + SQLUtils.enquoteLiteral(jsonValue) + ")").get().close();
+
+        try (QueryResponse  queryResponse = client.query("SELECT * FROM " + table + " LIMIT 1").get()) {
+            ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(queryResponse);
+            Map<String, Object> row = reader.next();
+            Object value = row.get("value");
+            System.out.println(value);
+        }
+    }
+
+    @DataProvider
+    public Object[][] testJSONBinaryFormat_dp() {
+
+        return new Object[][] {
+                {"JSON"},
+//                {"JSON(a Int32, d String)"},
+                {"JSON(stat.name String, count Int32)"},
+        };
+    }
+
     public static String tableDefinition(String table, String... columns) {
         StringBuilder sb = new StringBuilder();
         sb.append("CREATE TABLE " + table + " ( ");