root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Restore identifying org.hsqldb.jdbcDriver as embedded 

See gh-23036
This commit is contained in:
Andy Wilkinson 2020-09-07 14:03:10 +01:00
parent 115ea87b14
commit 5f00d91176
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,17 +59,25 @@ public enum EmbeddedDatabaseConnection {
/** /**
* HSQL Database Connection. * HSQL Database Connection.
*/ */
HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "jdbc:hsqldb:mem:%s"); HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
"jdbc:hsqldb:mem:%s");
private final EmbeddedDatabaseType type; private final EmbeddedDatabaseType type;
private final String driverClass; private final String driverClass;
private final String alternativeDriverClass;
private final String url; private final String url;
EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String url) { EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String url) {
this(type, driverClass, null, url);
}
EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String fallbackDriverClass, String url) {
this.type = type; this.type = type;
this.driverClass = driverClass; this.driverClass = driverClass;
this.alternativeDriverClass = fallbackDriverClass;
this.url = url; this.url = url;
} }
@ -106,8 +114,12 @@ public enum EmbeddedDatabaseConnection {
* @return true if the driver class is one of the embedded types * @return true if the driver class is one of the embedded types
*/ */
public static boolean isEmbedded(String driverClass) { public static boolean isEmbedded(String driverClass) {
return driverClass != null && (driverClass.equals(HSQL.driverClass) || driverClass.equals(H2.driverClass) return driverClass != null
|| driverClass.equals(DERBY.driverClass)); && (matches(HSQL, driverClass) || matches(H2, driverClass) || matches(DERBY, driverClass));
}
private static boolean matches(EmbeddedDatabaseConnection candidate, String driverClass) {
return driverClass.equals(candidate.driverClass) || driverClass.equals(candidate.alternativeDriverClass);
} }
/** /**