Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
5f00d911
Commit
5f00d911
authored
Sep 07, 2020
by
Andy Wilkinson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore identifying org.hsqldb.jdbcDriver as embedded
See gh-23036
parent
115ea87b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
EmbeddedDatabaseConnection.java
...springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+15
-3
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
View file @
5f00d911
...
...
@@ -59,17 +59,25 @@ public enum EmbeddedDatabaseConnection {
/**
* 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
String
driverClass
;
private
final
String
alternativeDriverClass
;
private
final
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
.
driverClass
=
driverClass
;
this
.
alternativeDriverClass
=
fallbackDriverClass
;
this
.
url
=
url
;
}
...
...
@@ -106,8 +114,12 @@ public enum EmbeddedDatabaseConnection {
* @return true if the driver class is one of the embedded types
*/
public
static
boolean
isEmbedded
(
String
driverClass
)
{
return
driverClass
!=
null
&&
(
driverClass
.
equals
(
HSQL
.
driverClass
)
||
driverClass
.
equals
(
H2
.
driverClass
)
||
driverClass
.
equals
(
DERBY
.
driverClass
));
return
driverClass
!=
null
&&
(
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
);
}
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment