Skip to content

Commit

Permalink
Respect custom username/password properties
Browse files Browse the repository at this point in the history
Fix a bug in `DataSourceInitializationConfiguration` and in
`R2dbcInitializationConfiguration` that was stopping
custom username/password properties from being applied.

Fixes gh-26676
  • Loading branch information
philwebb committed Jun 8, 2021
1 parent d19b268 commit f8c3e0e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Expand Up @@ -44,7 +44,7 @@ DataSourceScriptDatabaseInitializer dataSourceScriptDatabaseInitializer(DataSour

private static DataSource determineDataSource(DataSource dataSource, String username, String password) {
if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
DataSourceBuilder.derivedFrom(dataSource).username(username).password(password)
return DataSourceBuilder.derivedFrom(dataSource).username(username).password(password)
.type(SimpleDriverDataSource.class).build();
}
return dataSource;
Expand Down
Expand Up @@ -50,7 +50,7 @@ R2dbcScriptDatabaseInitializer r2dbcScriptDatabaseInitializer(ConnectionFactory
private static ConnectionFactory determineConnectionFactory(ConnectionFactory connectionFactory, String username,
String password) {
if (StringUtils.hasText(username) && StringUtils.hasText(password)) {
ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build();
return ConnectionFactoryBuilder.derivefrom(connectionFactory).username(username).password(password).build();
}
return connectionFactory;
}
Expand Down

0 comments on commit f8c3e0e

Please sign in to comment.