Skip to content

Expose database, username, password args for ClickHouseContainer #417

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
dimafeng merged 1 commit into from
Feb 14, 2025
Merged

Expose database, username, password args for ClickHouseContainer #417

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 25 additions & 6 deletions modules/clickhouse/src/main/scala/com/dimafeng/testcontainers/ClickHouseContainer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,49 @@
package com.dimafeng.testcontainers

import org.testcontainers.containers.{ClickHouseContainer => JavaClickHouseContainer}
import org.testcontainers.clickhouse.{ClickHouseContainer => JavaClickHouseContainer}
Copy link
Contributor Author

@pan3793 pan3793 Feb 14, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

migration that follows the deprecation message

import org.testcontainers.utility.DockerImageName

case class ClickHouseContainer(
dockerImageName: DockerImageName = DockerImageName.parse(ClickHouseContainer.defaultDockerImageName)
dockerImageName: DockerImageName = DockerImageName.parse(ClickHouseContainer.defaultDockerImageName),
clickhouseDatabaseName: Option[String] = None,
clickhouseUsername: Option[String] = None,
clickhousePassword: Option[String] = None
) extends SingleContainer[JavaClickHouseContainer] with JdbcDatabaseContainer {

override val container: JavaClickHouseContainer = new JavaClickHouseContainer(dockerImageName)
override val container: JavaClickHouseContainer = {
val c = new JavaClickHouseContainer(dockerImageName)
clickhouseDatabaseName.map(c.withDatabaseName)
clickhouseUsername.map(c.withUsername)
clickhousePassword.map(c.withPassword)
c
}

def testQueryString: String = container.getTestQueryString
}

object ClickHouseContainer {

val defaultDockerImageName = s"${JavaClickHouseContainer.IMAGE}:${JavaClickHouseContainer.DEFAULT_TAG}"
// Copy String literal because JavaClickHouseContainer.CLICKHOUSE_IMAGE_NAME is private
val defaultDockerImageName = "clickhouse/clickhouse-server"
val defaultDatabaseName = "test"
val defaultUsername = "test"
val defaultPassword = "test"

case class Def(
dockerImageName: DockerImageName = DockerImageName.parse(ClickHouseContainer.defaultDockerImageName)
dockerImageName: DockerImageName = DockerImageName.parse(defaultDockerImageName),
databaseName: String = defaultDatabaseName,
username: String = defaultUsername,
password: String = defaultPassword,
) extends ContainerDef {

override type Container = ClickHouseContainer

override def createContainer(): ClickHouseContainer = {
new ClickHouseContainer(
dockerImageName = dockerImageName
dockerImageName = dockerImageName,
clickhouseDatabaseName = Some(databaseName),
clickhouseUsername = Some(username),
clickhousePassword = Some(password)
)
}
}
Expand Down
Loading