Skip to content

Compose Dev Services MS SQL connection url fix #48335

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 1 commit into from
Jun 12, 2025
Merged

Compose Dev Services MS SQL connection url fix #48335

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: 5 additions & 1 deletion ...ces/common/src/main/java/io/quarkus/devservices/common/DatasourceServiceConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,13 @@ default String getJdbcUrl(ContainerAddress containerAddress, String databaseName

String getJdbcPrefix();

default String getParametersStartCharacter() {
return "?";
}

default String getParameters(Map<String, String> labels) {
String parameters = labels.get(Labels.COMPOSE_JDBC_PARAMETERS);
return StringUtil.isNullOrEmpty(parameters) ? "" : "?" + parameters;
return StringUtil.isNullOrEmpty(parameters) ? "" : getParametersStartCharacter() + parameters;
}

}
27 changes: 19 additions & 8 deletions ...main/java/io/quarkus/devservices/mssql/deployment/MSSQLDatasourceServiceConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.quarkus.devservices.mssql.deployment;

import static io.quarkus.datasource.deployment.spi.DatabaseDefaultSetupConfig.DEFAULT_DATABASE_NAME;
import static io.quarkus.datasource.deployment.spi.DatabaseDefaultSetupConfig.DEFAULT_DATABASE_PASSWORD;
import static io.quarkus.datasource.deployment.spi.DatabaseDefaultSetupConfig.DEFAULT_DATABASE_USERNAME;

import io.quarkus.datasource.deployment.spi.DevServicesDatasourceContainerConfig;
import io.quarkus.datasource.deployment.spi.DevServicesDatasourceProvider.RunningDevServicesDatasource;
Expand All @@ -12,17 +10,16 @@

public class MSSQLDatasourceServiceConfigurator implements DatasourceServiceConfigurator {

private final static String[] PASSWORD_ENVS = new String[] { "MSSQL_SA_PASSWORD", "SA_PASSWORD" };
private final static String[] PASSWORD_ENVS = new String[] { "MSSQL_SA_PASSWORD", "SA_PASSWORD", "MSSQL_PASSWORD" };

private final static String[] DATABASE_ENVS = new String[] { "POSTGRES_DB", "POSTGRESQL_DB", "POSTGRESQL_DATABASE" };
private final static String DEFAULT_MSSQL_USERNAME = "sa";

public RunningDevServicesDatasource composeRunningService(ContainerAddress containerAddress,
DevServicesDatasourceContainerConfig containerConfig) {
RunningContainer container = containerAddress.getRunningContainer();
String effectiveDbName = containerConfig.getDbName().orElse(DEFAULT_DATABASE_NAME);
String effectiveUsername = containerConfig.getDbName().orElse(DEFAULT_DATABASE_USERNAME);
String effectivePassword = containerConfig.getDbName().orElse(DEFAULT_DATABASE_PASSWORD);
String jdbcUrl = getJdbcUrl(containerAddress, container.tryGetEnv(DATABASE_ENVS).orElse(effectiveDbName));
String effectiveUsername = containerConfig.getUsername().orElse(DEFAULT_MSSQL_USERNAME);
String effectivePassword = containerConfig.getPassword().orElse(DEFAULT_DATABASE_PASSWORD);
String jdbcUrl = getJdbcUrl(containerAddress, null);
String reactiveUrl = getReactiveUrl(jdbcUrl);
return new RunningDevServicesDatasource(
containerAddress.getId(),
Expand All @@ -38,4 +35,18 @@ public String getJdbcPrefix() {
return "sqlserver";
}

@Override
public String getParametersStartCharacter() {
return ";";
}

@Override
public String getJdbcUrl(ContainerAddress containerAddress, String databaseName) {
return String.format("jdbc:%s://%s:%d%s",
getJdbcPrefix(),
containerAddress.getHost(),
containerAddress.getPort(),
getParameters(containerAddress.getRunningContainer().containerInfo().labels()));
}

}
Loading