Add tests for unusual String parameters

Author: enqueue

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -2027,6 +2027,7 @@ protected int getOperationTimeout() {
      * @return - set of endpoints
      * @deprecated
      */
+    @Deprecated
     public Set<String> getEndpoints() {
         return endpoints.stream().map(Endpoint::getBaseURL).collect(Collectors.toSet());
     }
@@ -2108,4 +2109,5 @@ private Map<String, String> formatQueryParameters(Map<String, Object> queryParam
         }
         return newMap;
     }
+
 }

client-v2/src/main/java/com/clickhouse/client/api/DataTypeUtils.java

@@ -103,7 +103,7 @@ public static String format(Object object, ClickHouseDataType dataTypeHint,
         if (object instanceof Instant) {
             return formatInstant((Instant) object, dataTypeHint, timeZone);
         }
-        return String.valueOf(object);
+        return escapeString(String.valueOf(object));
     }
 
     private static String formatInstant(Instant instant, ClickHouseDataType dataTypeHint,
@@ -137,4 +137,8 @@ private static String formatInstantDefault(Instant instant) {
         return String.valueOf(instant.getEpochSecond()) + "." + new String(n);
     }
 
+    private static String escapeString(String x) {
+        return x.replace("\\", "\\\\").replace("'", "\\'");
+    }
+
 }

client-v2/src/test/java/com/clickhouse/client/e2e/ParameterizedQueryTest.java

@@ -23,6 +23,7 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
 import com.clickhouse.client.BaseIntegrationTest;
@@ -232,6 +233,31 @@ void testParamsWithInstant() throws Exception {
         }
     }
 
+    @Test(dataProvider = "stringParameters")
+    void testStringParams(String paramValue) throws Exception {
+        String table = "test_params_unicode";
+        String column = "val";
+        client.execute("DROP TABLE IF EXISTS " + table).get();
+        client.execute("CREATE TABLE " + table + "(" + column + " String) Engine = Memory").get();
+        client.query(
+            "INSERT INTO " + table + "(" + column + ") VALUES ('" + paramValue + "')").get();
+        try (QueryResponse r = client.query(
+            "SELECT " + column + " FROM " + table + " WHERE " + column + "='" + paramValue + "'").get();
+            ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(r))
+        {
+            reader.next();
+            Assert.assertEquals(reader.getString(1), paramValue);
+        }
+        try (QueryResponse r = client.query(
+            "SELECT " + column + " FROM " + table + " WHERE " + column + "={x:String}",
+            Collections.singletonMap("x", paramValue)).get();
+            ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(r))
+        {
+            reader.next();
+            Assert.assertEquals(reader.getString(1), paramValue);
+        }
+    }
+
     private int[] queryInstant(String tableName, String fieldName, String operator,
         Instant param, int scale) throws InterruptedException, ExecutionException, Exception
     {
@@ -255,13 +281,13 @@ private Client.Builder newClient() {
         ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
         boolean isSecure = isCloud();
         return new Client.Builder()
-                .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), isSecure)
-                .setUsername("default")
-                .setPassword(ClickHouseServerForTest.getPassword())
-                .compressClientRequest(false)
-                .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
-                .serverSetting(ServerSettings.WAIT_ASYNC_INSERT, "1")
-                .serverSetting(ServerSettings.ASYNC_INSERT, "0");
+            .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), isSecure)
+            .setUsername("default")
+            .setPassword(ClickHouseServerForTest.getPassword())
+            .compressClientRequest(false)
+            .setDefaultDatabase(ClickHouseServerForTest.getDatabase())
+            .serverSetting(ServerSettings.WAIT_ASYNC_INSERT, "1")
+            .serverSetting(ServerSettings.ASYNC_INSERT, "0");
     }
 
     private void prepareDataSet(String table, List<String> columns, List<Supplier<Object>> valueGenerators,
@@ -319,4 +345,18 @@ private Map<String, Object> writeValuesRow(StringBuilder insertStmtBuilder, List
         return values;
     }
 
+    @DataProvider(name = "stringParameters")
+    private static Object[][] createStringParameterValues() {
+        return new Object[][] {
+            { "foo" },
+            { "with-dashes" },
+            { "☺" },
+            { "foo/bar" },
+            { "foobar 20" },
+            { " leading_and_trailing_spaces   " },
+            { "multi\nline\r\ndos" },
+            { "nicely\"quoted\'string\'" },
+        };
+    }
+
 }