Fix for Can't connect to a local h2 database created without username #23538", the url is now added to the isEmbedded() and for the autoconfiguration of the database - the primary db rewire is set to true.

Author: somayaj

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

@@ -325,7 +325,7 @@ public String determineUsername() {
 		if (StringUtils.hasText(this.username)) {
 			return this.username;
 		}
-		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
+		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName(), determineUrl())) {
 			return "sa";
 		}
 		return null;
@@ -353,7 +353,7 @@ public String determinePassword() {
 		if (StringUtils.hasText(this.password)) {
 			return this.password;
 		}
-		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName())) {
+		if (EmbeddedDatabaseConnection.isEmbedded(determineDriverClassName(), determineUrl())) {
 			return "";
 		}
 		return null;

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

@@ -101,7 +101,7 @@ private void process(BeanDefinitionRegistry registry, ConfigurableListableBeanFa
 
 		private BeanDefinition createEmbeddedBeanDefinition(boolean primary) {
 			BeanDefinition beanDefinition = new RootBeanDefinition(EmbeddedDataSourceFactoryBean.class);
-			beanDefinition.setPrimary(primary);
+			beanDefinition.setPrimary(true);
 			return beanDefinition;
 		}
 

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

@@ -28,6 +28,7 @@
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Connection details for {@link EmbeddedDatabaseType embedded databases}.
@@ -122,10 +123,21 @@ public String getUrl(String databaseName) {
 	 * @param driverClass the driver class
 	 * @return true if the driver class is one of the embedded types
 	 */
-	public static boolean isEmbedded(String driverClass) {
+	@Deprecated public static boolean isEmbedded(String driverClass) {
 		return driverClass != null && (matches(HSQL, driverClass) || matches(H2, driverClass)
 				|| matches(DERBY, driverClass) || matches(HSQLDB, driverClass));
 	}
+	/**
+	 * Convenience method to determine if a given driver class name and url represents an embedded
+	 * database type.The exception is made for the H2 database for embedded types.
+	 * @param driverClass the driver class
+	 * @param url the jdbc url
+	 * @return true if the driver class is one of the embedded types
+	 */
+	public static boolean isEmbedded(String driverClass, String url) {
+		return (driverClass != null && (matches(HSQL, driverClass) || ( matches(H2, driverClass) && !StringUtils.hasText("mem"))
+				|| matches(DERBY, driverClass) || matches(HSQLDB, driverClass)));
+	}
 
 	private static boolean matches(EmbeddedDatabaseConnection candidate, String driverClass) {
 		return driverClass.equals(candidate.driverClass) || driverClass.equals(candidate.alternativeDriverClass);