diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
index 54b7fb20e033..08ab636d8d9a 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClient.java
@@ -110,7 +110,7 @@
import java.util.function.BiFunction;
import java.util.stream.Collectors;
-import static com.clickhouse.data.ClickHouseValues.convertToQuotedString;
+import static com.clickhouse.data.ClickHouseUtils.escape;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Strings.emptyToNull;
import static com.google.common.base.Strings.isNullOrEmpty;
@@ -580,7 +580,7 @@ public void dropNotNullConstraint(ConnectorSession session, JdbcTableHandle hand
private static String clickhouseVarcharLiteral(String value)
{
requireNonNull(value, "value is null");
- return convertToQuotedString(value);
+ return "'" + escape(value, '\'') + "'";
}
@Override
diff --git a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
index 0f170a7ca599..0bdeb51ab941 100644
--- a/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
+++ b/plugin/trino-clickhouse/src/main/java/io/trino/plugin/clickhouse/ClickHouseClientModule.java
@@ -13,7 +13,7 @@
*/
package io.trino.plugin.clickhouse;
-import com.clickhouse.jdbc.ClickHouseDriver;
+import com.clickhouse.jdbc.DriverV1;
import com.google.inject.Binder;
import com.google.inject.Module;
import com.google.inject.Provides;
@@ -70,7 +70,7 @@ public static ConnectionFactory createConnectionFactory(BaseJdbcConfig config, C
// https://github.com/ClickHouse/clickhouse-java/issues/1584
// in Clickhouse itself it has been left `true` by default only for backward compatibility.
properties.setProperty(PROP_EXTERNAL_DATABASE, "false");
- return new ClickHouseConnectionFactory(DriverConnectionFactory.builder(new ClickHouseDriver(), config.getConnectionUrl(), credentialProvider)
+ return new ClickHouseConnectionFactory(DriverConnectionFactory.builder(new DriverV1(), config.getConnectionUrl(), credentialProvider)
.setConnectionProperties(properties)
.setOpenTelemetry(openTelemetry)
.build());
diff --git a/pom.xml b/pom.xml
index 5b9fc309d916..162dc084809c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -394,8 +394,14 @@
com.clickhouse
clickhouse-jdbc
- 0.7.1-patch1
+ 0.9.8
all
+
+
+ com.google.guava
+ listenablefuture
+
+