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
053323f5
Commit
053323f5
authored
Feb 10, 2021
by
anudeepg
Committed by
Stephane Nicoll
Feb 15, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix database name detection logic for MariaDB
See gh-25173
parent
b50fb824
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
8 deletions
+2
-8
DatabaseDriver.java
...in/java/org/springframework/boot/jdbc/DatabaseDriver.java
+1
-8
DatabaseDriverTests.java
...va/org/springframework/boot/jdbc/DatabaseDriverTests.java
+1
-0
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View file @
053323f5
...
...
@@ -70,8 +70,7 @@ public enum DatabaseDriver {
/**
* Maria DB.
*/
MARIADB
(
"MySQL"
,
"org.mariadb.jdbc.Driver"
,
"org.mariadb.jdbc.MariaDbDataSource"
,
"SELECT 1"
)
{
MARIADB
(
"MariaDB"
,
"org.mariadb.jdbc.Driver"
,
"org.mariadb.jdbc.MariaDbDataSource"
,
"SELECT 1"
)
{
@Override
public
String
getId
()
{
return
"mysql"
;
...
...
@@ -122,7 +121,6 @@ public enum DatabaseDriver {
*/
SQLSERVER
(
"Microsoft SQL Server"
,
"com.microsoft.sqlserver.jdbc.SQLServerDriver"
,
"com.microsoft.sqlserver.jdbc.SQLServerXADataSource"
,
"SELECT 1"
)
{
@Override
protected
boolean
matchProductName
(
String
productName
)
{
return
super
.
matchProductName
(
productName
)
||
"SQL SERVER"
.
equalsIgnoreCase
(
productName
);
...
...
@@ -135,7 +133,6 @@ public enum DatabaseDriver {
*/
FIREBIRD
(
"Firebird"
,
"org.firebirdsql.jdbc.FBDriver"
,
"org.firebirdsql.ds.FBXADataSource"
,
"SELECT 1 FROM RDB$DATABASE"
)
{
@Override
protected
Collection
<
String
>
getUrlPrefixes
()
{
return
Arrays
.
asList
(
"firebirdsql"
,
"firebird"
);
...
...
@@ -152,7 +149,6 @@ public enum DatabaseDriver {
* DB2 Server.
*/
DB2
(
"DB2"
,
"com.ibm.db2.jcc.DB2Driver"
,
"com.ibm.db2.jcc.DB2XADataSource"
,
"SELECT 1 FROM SYSIBM.SYSDUMMY1"
)
{
@Override
protected
boolean
matchProductName
(
String
productName
)
{
return
super
.
matchProductName
(
productName
)
||
productName
.
toLowerCase
(
Locale
.
ENGLISH
).
startsWith
(
"db2/"
);
...
...
@@ -164,7 +160,6 @@ public enum DatabaseDriver {
*/
DB2_AS400
(
"DB2 UDB for AS/400"
,
"com.ibm.as400.access.AS400JDBCDriver"
,
"com.ibm.as400.access.AS400JDBCXADataSource"
,
"SELECT 1 FROM SYSIBM.SYSDUMMY1"
)
{
@Override
public
String
getId
()
{
return
"db2"
;
...
...
@@ -190,7 +185,6 @@ public enum DatabaseDriver {
* Informix.
*/
INFORMIX
(
"Informix Dynamic Server"
,
"com.informix.jdbc.IfxDriver"
,
null
,
"select count(*) from systables"
)
{
@Override
protected
Collection
<
String
>
getUrlPrefixes
()
{
return
Arrays
.
asList
(
"informix-sqli"
,
"informix-direct"
);
...
...
@@ -208,7 +202,6 @@ public enum DatabaseDriver {
* Testcontainers.
*/
TESTCONTAINERS
(
null
,
"org.testcontainers.jdbc.ContainerDatabaseDriver"
)
{
@Override
protected
Collection
<
String
>
getUrlPrefixes
()
{
return
Collections
.
singleton
(
"tc"
);
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
View file @
053323f5
...
...
@@ -69,6 +69,7 @@ class DatabaseDriverTests {
assertThat
(
DatabaseDriver
.
fromProductName
(
"HSQL Database Engine"
)).
isEqualTo
(
DatabaseDriver
.
HSQLDB
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"SQLite"
)).
isEqualTo
(
DatabaseDriver
.
SQLITE
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"MySQL"
)).
isEqualTo
(
DatabaseDriver
.
MYSQL
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"MariaDB"
)).
isEqualTo
(
DatabaseDriver
.
MARIADB
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"Oracle"
)).
isEqualTo
(
DatabaseDriver
.
ORACLE
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"PostgreSQL"
)).
isEqualTo
(
DatabaseDriver
.
POSTGRESQL
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"Amazon Redshift"
)).
isEqualTo
(
DatabaseDriver
.
REDSHIFT
);
...
...
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