fixed converter for dynamic types and make tool to enquote lists

Author: chernser

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

@@ -6,6 +6,7 @@
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -202,6 +203,11 @@ public String arrayToString(Object value, ClickHouseColumn column) {
         return value.toString();
     }
 
+    public String arrayToString(Object value, String columnDef) {
+        ClickHouseColumn column = ClickHouseColumn.of("v", columnDef);
+        return arrayToString(value, column);
+    }
+
     /**
      *
      * @param value not null object value to convert
@@ -215,6 +221,18 @@ public String variantOrDynamicToString(Object value, ClickHouseColumn column) {
         return value.toString();
     }
 
+    private static void appendEnquotedArrayElement(String value, ClickHouseColumn elementColumn, Appendable appendable) {
+        try {
+            if (elementColumn != null && elementColumn.getDataType() == ClickHouseDataType.String) {
+                appendable.append(QUOTE).append(value).append(QUOTE);
+            } else {
+                appendable.append(value);
+            }
+        } catch (IOException e) {
+            throw new ClickHouseException(e.getMessage(), e);
+        }
+    }
+
     private final class ArrayAsStringWriter extends BaseCollectionConverter.BaseArrayWriter {
         private ClickHouseColumn column;
 
@@ -233,16 +251,9 @@ protected void onItem(Object item, ListConversionState<Object> state) {
                 append(NULL);
                 return;
             }
-            String str = DataTypeConverter.this.convertToString(item, column.getArrayBaseColumn() == null ? column : column.getArrayBaseColumn());
-            try {
-                if (column.getArrayBaseColumn().getDataType() == ClickHouseDataType.String) {
-                    appendable.append(QUOTE).append(str).append(QUOTE);
-                } else {
-                    appendable.append(str);
-                }
-            } catch (Exception ex) {
-                throw new ClickHouseException(ex.getMessage(), ex);
-            }
+            ClickHouseColumn elementColumn = column.getArrayBaseColumn() == null ? column : column.getArrayBaseColumn();
+            String str = DataTypeConverter.this.convertToString(item, elementColumn);
+            appendEnquotedArrayElement(str, elementColumn, appendable);
         }
 
         public String convertAndReset(Object list, Appendable acc, ClickHouseColumn column) {
@@ -270,7 +281,10 @@ protected void onItem(Object item, ListConversionState<List<?>> state) {
                 append(NULL);
                 return;
             }
-            append(DataTypeConverter.this.convertToString(item, column.getArrayBaseColumn() == null ? column : column.getArrayBaseColumn()));
+            ClickHouseColumn elementColumn = column.getArrayBaseColumn() == null ? column : column.getArrayBaseColumn();
+            String str = DataTypeConverter.this.convertToString(item, elementColumn);
+            appendEnquotedArrayElement(str, elementColumn, appendable);
+
         }
 
         public String convertAndReset(List<?> list, Appendable acc, ClickHouseColumn column) {

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -16,6 +16,7 @@
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.insert.InsertSettings;
+import com.clickhouse.client.api.internal.DataTypeConverter;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.client.api.internal.StopWatch;
 import com.clickhouse.client.api.metadata.TableSchema;
@@ -1634,6 +1635,20 @@ public void testQueryParams() throws Exception {
         Assert.assertEquals(allRecords.size(), 2);
     }
 
+    @Test(groups = {"integration"})
+    public void testQueryParamsWithArrays() {
+        final Map<String, Object> params = new HashMap<>();
+        params.put("database_name", "system");
+        params.put("table_names",
+                DataTypeConverter.INSTANCE.arrayToString(Arrays.asList("COLLATIONS", "ENGINES"), "Array(String)"));
+        // This query should not throw an exception
+        List<GenericRecord> records = client.queryAll("SELECT database, name FROM system.tables WHERE name IN {table_names:Array(String)}",
+                params);
+
+        Assert.assertEquals(records.get(0).getString("name"), "COLLATIONS");
+        Assert.assertEquals(records.get(1).getString("name"), "ENGINES");
+    }
+
     @Test(groups = {"integration"})
     public void testExecuteQueryParam() throws ExecutionException, InterruptedException, TimeoutException {