Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,14 @@
<dependency>
<groupId>com.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
<version>0.7.1-patch1</version>
<version>0.9.8</version>
<classifier>all</classifier>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down