Skip to content

Append URL parameters in TrinoContainer.getJdbcUrl() #12073

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

Open
Gaurav1112 wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −4
Open

Append URL parameters in TrinoContainer.getJdbcUrl() #12073

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions modules/trino/src/main/java/org/testcontainers/containers/TrinoContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,13 @@ public String getDriverClassName() {

@Override
public String getJdbcUrl() {
String additionalUrlParams = constructUrlParameters("?", "&");
return String.format(
"jdbc:trino://%s:%s/%s",
"jdbc:trino://%s:%s/%s%s",
getHost(),
getMappedPort(TRINO_PORT),
Strings.nullToEmpty(catalog)
Strings.nullToEmpty(catalog),
additionalUrlParams
);
}

Expand Down
6 changes: 4 additions & 2 deletions modules/trino/src/main/java/org/testcontainers/trino/TrinoContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,13 @@ public String getDriverClassName() {

@Override
public String getJdbcUrl() {
String additionalUrlParams = constructUrlParameters("?", "&");
return String.format(
"jdbc:trino://%s:%s/%s",
"jdbc:trino://%s:%s/%s%s",
getHost(),
getMappedPort(TRINO_PORT),
Strings.nullToEmpty(catalog)
Strings.nullToEmpty(catalog),
additionalUrlParams
);
}

Expand Down
20 changes: 20 additions & 0 deletions modules/trino/src/test/java/org/testcontainers/trino/TrinoContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,26 @@ void testInitScript() throws Exception {
}
}

@Test
void testWithAdditionalUrlParamInJdbcUrl() throws Exception {
try (
TrinoContainer trino = new TrinoContainer(TrinoTestImages.TRINO_TEST_IMAGE)
.withUrlParam("applicationNamePrefix", "tc-")
) {
trino.start();
String jdbcUrl = trino.getJdbcUrl();
assertThat(jdbcUrl).contains("?");
assertThat(jdbcUrl).contains("applicationNamePrefix=tc-");
try (
Connection connection = trino.createConnection();
Statement statement = connection.createStatement();
ResultSet resultSet = statement.executeQuery("SELECT 1")
) {
assertThat(resultSet.next()).as("results").isTrue();
}
}
}

private void assertContainerHasCorrectExposedAndLivenessCheckPorts(TrinoContainer trino) {
assertThat(trino.getExposedPorts()).containsExactly(8080);
assertThat(trino.getLivenessCheckPortNumbers()).containsExactly(trino.getMappedPort(8080));
Expand Down