Skip to content

Commit 0c1ea51

Browse files
committed
Revert "fix for Can't connect to a local h2 database created without username #23538"
This reverts commit fae930c
1 parent fae930c commit 0c1ea51

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,13 @@ public void setUsername(String username) {
322322
* @since 1.4.0
323323
*/
324324
public String determineUsername() {
325-
if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName()) && !StringUtils.hasText(determineUrl())) {
326-
return "sa";
327-
}
328-
else {
325+
if (StringUtils.hasText(this.username)) {
329326
return this.username;
330327
}
328+
if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
329+
return "sa";
330+
}
331+
return null;
331332
}
332333

333334
/**
@@ -349,12 +350,13 @@ public void setPassword(String password) {
349350
* @since 1.4.0
350351
*/
351352
public String determinePassword() {
352-
if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName()) && !StringUtils.hasText(determineUrl())) {
353-
return "";
354-
}
355-
else {
353+
if (StringUtils.hasText(this.password)) {
356354
return this.password;
357355
}
356+
if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
357+
return "";
358+
}
359+
return null;
358360
}
359361

360362
public String getJndiName() {

spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ private static class EmbeddedDataSourceBeanFactoryPostProcessor implements BeanD
8080
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
8181
Assert.isInstanceOf(ConfigurableListableBeanFactory.class, registry,
8282
"Test Database Auto-configuration can only be used with a ConfigurableListableBeanFactory");
83+
process(registry, (ConfigurableListableBeanFactory) registry);
8384
}
8485

8586
@Override

0 commit comments

Comments
 (0)