Skip to content

fix: host less JDBC URI ignores the database name #8212

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

Closed
wai4y wants to merge 2 commits into from
Closed

fix: host less JDBC URI ignores the database name #8212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e12c86c
fix: host less URI ignores the database name
wai4y Jan 31, 2024
4655019
Merge branch 'main' into fix/host-less-URI
wai4y Feb 3, 2024
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: 3 additions & 3 deletions modules/jdbc/src/main/java/org/testcontainers/jdbc/ConnectionUrl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private void parseUrl() {
//In case it matches to the default pattern
Matcher dbInstanceMatcher = Patterns.DB_INSTANCE_MATCHING_PATTERN.matcher(dbHostString);
if (dbInstanceMatcher.matches()) {
databaseHost = Optional.of(dbInstanceMatcher.group("databaseHost"));
databaseHost = Optional.ofNullable(dbInstanceMatcher.group("databaseHost"));
databasePort = Optional.ofNullable(dbInstanceMatcher.group("databasePort")).map(Integer::valueOf);
databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
}
Expand Down Expand Up @@ -227,13 +227,13 @@ public interface Patterns {

//Matches to part of string - hostname:port/databasename
Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile(
"(?<databaseHost>[^:]+)" +
"((?<databaseHost>[^:]+)" +
"(:(?<databasePort>[0-9]+))?" +
"(" +
"(?<sidOrServiceName>[:/])" +
"|" +
";databaseName=" +
")" +
")|/)" +
"(?<databaseName>[^\\\\?]+)"
);

Expand Down
8 changes: 8 additions & 0 deletions modules/jdbc/src/test/java/org/testcontainers/jdbc/ConnectionUrlTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,4 +111,12 @@ public void testDaemonCapture() {

assertThat(url.isInDaemonMode()).as("Daemon flag is set to true.").isTrue();
}

@Test
public void testHostLessUrl() {
String urlString = "jdbc:tc:mysql:///dbname";
ConnectionUrl url = ConnectionUrl.newInstance(urlString);

assertThat(url.getDatabaseName()).as("Database Name value is expected").contains("dbname");
}
}