From 9075da7ae7409d167ef4a2d31ddb45ccd6062f80 Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Tue, 2 Aug 2022 12:24:14 +0800
Subject: [PATCH 1/2] Prefer to use new ClickHouse JDBC driver

---
 .../org/testcontainers/containers/ClickHouseContainer.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4e87c77ee5b..4add6c4cf3a 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -25,7 +25,9 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     public static final Integer NATIVE_PORT = 9000;
 
-    private static final String DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
+    private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
+    
+    private static final String LEGACY_DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
 
     private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
 
@@ -72,7 +74,7 @@ public String getDriverClassName() {
             Class.forName(DRIVER_CLASS_NAME);
             return DRIVER_CLASS_NAME;
         } catch (ClassNotFoundException e) {
-            return "com.clickhouse.jdbc.ClickHouseDriver";
+            return LEGACY_DRIVER_CLASS_NAME;
         }
     }
 

From da36b316c5fd4bdba8ed182c05bef4a18b40829e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= <eddu.melendez@gmail.com>
Date: Tue, 16 Aug 2022 10:42:27 -0500
Subject: [PATCH 2/2] Fix format

---
 .../java/org/testcontainers/containers/ClickHouseContainer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
index 4add6c4cf3a..e68acfb20db 100644
--- a/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
+++ b/modules/clickhouse/src/main/java/org/testcontainers/containers/ClickHouseContainer.java
@@ -26,7 +26,7 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
     public static final Integer NATIVE_PORT = 9000;
 
     private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
-    
+
     private static final String LEGACY_DRIVER_CLASS_NAME = "ru.yandex.clickhouse.ClickHouseDriver";
 
     private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";