Skip to content

Copy properties instead of setting as default value #128

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
rbygrave merged 1 commit into from
Apr 15, 2025
Merged

Copy properties instead of setting as default value #128

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
3 changes: 2 additions & 1 deletion ebean-datasource-api/src/main/java/io/ebean/datasource/DataSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ public DataSourceConfig copy() {
copy.customProperties = new LinkedHashMap<>(customProperties);
}
if (clientInfo != null) {
copy.clientInfo = new Properties(clientInfo);
copy.clientInfo = new Properties();
copy.clientInfo.putAll(clientInfo);
}
copy.initSql = initSql;
copy.alert = alert;
Expand Down
6 changes: 4 additions & 2 deletions ebean-datasource/src/main/java/io/ebean/datasource/pool/DriverDataSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ static DataSource of(String name, DataSourceBuilder.Settings builder) {

@Override
public Connection getConnection(String username, String password) throws SQLException {
final var props = new Properties(connectionProps);
final var props = new Properties();
props.putAll(connectionProps);
props.setProperty("user", username);
props.setProperty("password", password);
return driver.connect(url, props);
Expand All @@ -67,7 +68,8 @@ public Connection getConnection() throws SQLException {
}

private Connection switchCredentials(Properties properties) throws SQLException {
var copy = new Properties(properties);
var copy = new Properties();
copy.putAll(properties);
copy.setProperty("password", password2);
var connection = driver.connect(url, copy);
// success, permanently switch to use password2 from now on
Expand Down
Loading