Skip to content

Fix clickhouse authentication #9942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 10, 2025
Merged

Fix clickhouse authentication #9942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b38198
fix: the issue that the authorization of the default user fails is fixed
livk-cloud Feb 7, 2025
cd76965
test: add clickhouse test
livk-cloud Feb 7, 2025
c349b1d
Polish
eddumelendez Feb 10, 2025
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
8 changes: 3 additions & 5 deletions modules/clickhouse/src/main/java/org/testcontainers/clickhouse/ClickHouseContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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";

Expand Down
2 changes: 2 additions & 0 deletions modules/clickhouse/src/test/java/org/testcontainers/ClickhouseTestImages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
17 changes: 15 additions & 2 deletions modules/clickhouse/src/test/java/org/testcontainers/clickhouse/ClickHouseContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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")
) {
Expand All @@ -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);
}
}
}
Loading