Fix clickhouse authentication (#9942)

Fixes #9939

---------

Co-authored-by: Eddú Meléndez <[email protected]>

Author: livk-cloud

modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java

@@ -21,8 +21,6 @@
  */
 public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContainer> {
 
-    private static final String NAME = "clickhouse";
-
     static final String CLICKHOUSE_CLICKHOUSE_SERVER = "clickhouse/clickhouse-server";
 
     private static final DockerImageName CLICKHOUSE_IMAGE_NAME = DockerImageName.parse(CLICKHOUSE_CLICKHOUSE_SERVER);
@@ -33,13 +31,13 @@ public class ClickHouseContainer extends JdbcDatabaseContainer<ClickHouseContain
 
     private static final String DRIVER_CLASS_NAME = "com.clickhouse.jdbc.ClickHouseDriver";
 
-    private static final String JDBC_URL_PREFIX = "jdbc:" + NAME + "://";
+    private static final String JDBC_URL_PREFIX = "jdbc:clickhouse://";
 
     private static final String TEST_QUERY = "SELECT 1";
 
-    static final String DEFAULT_USER = "default";
+    static final String DEFAULT_USER = "test";
 
-    static final String DEFAULT_PASSWORD = "";
+    static final String DEFAULT_PASSWORD = "test";
 
     private String databaseName = "default";
 

modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java

@@ -4,4 +4,6 @@
 
 public interface ClickhouseTestImages {
     DockerImageName CLICKHOUSE_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:21.9.2-alpine");
+
+    DockerImageName CLICKHOUSE_24_12_IMAGE = DockerImageName.parse("clickhouse/clickhouse-server:24.12-alpine");
 }

modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java

@@ -1,6 +1,7 @@
 package org.testcontainers.clickhouse;
 
 import org.junit.Test;
+import org.testcontainers.ClickhouseTestImages;
 import org.testcontainers.db.AbstractContainerDatabaseTest;
 
 import java.sql.ResultSet;
@@ -26,8 +27,8 @@ public void testSimple() throws SQLException {
     public void customCredentialsWithUrlParams() throws SQLException {
         try (
             ClickHouseContainer clickhouse = new ClickHouseContainer("clickhouse/clickhouse-server:21.9.2-alpine")
-                .withUsername("test")
-                .withPassword("test")
+                .withUsername("default")
+                .withPassword("")
                 .withDatabaseName("test")
                 .withUrlParam("max_result_rows", "5")
         ) {
@@ -42,4 +43,16 @@ public void customCredentialsWithUrlParams() throws SQLException {
             assertThat(resultSetInt).isEqualTo(5);
         }
     }
+
+    @Test
+    public void testNewAuth() throws SQLException {
+        try (ClickHouseContainer clickhouse = new ClickHouseContainer(ClickhouseTestImages.CLICKHOUSE_24_12_IMAGE)) {
+            clickhouse.start();
+
+            ResultSet resultSet = performQuery(clickhouse, "SELECT 1");
+
+            int resultSetInt = resultSet.getInt(1);
+            assertThat(resultSetInt).isEqualTo(1);
+        }
+    }
 }