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
34156b21
Commit
34156b21
authored
Oct 24, 2018
by
Madhura Bhave
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename DatabaseDriver#SAP to DatabaseDriver#HANA
Closes gh-14918
parent
e2085ffa
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
DatabaseDriver.java
...in/java/org/springframework/boot/jdbc/DatabaseDriver.java
+8
-3
DatabaseDriverClassNameTests.java
...ringframework/boot/jdbc/DatabaseDriverClassNameTests.java
+1
-1
DatabaseDriverTests.java
...va/org/springframework/boot/jdbc/DatabaseDriverTests.java
+2
-2
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
View file @
34156b21
...
@@ -100,11 +100,16 @@ public enum DatabaseDriver {
...
@@ -100,11 +100,16 @@ public enum DatabaseDriver {
"SELECT 1"
),
"SELECT 1"
),
/**
/**
*
SAP - SAP Hana
Database - HDB.
*
HANA - SAP HANA
Database - HDB.
* @since 2.1.0
* @since 2.1.0
*/
*/
SAP
(
"HDB"
,
"com.sap.db.jdbc.Driver"
,
"com.sap.db.jdbcext.XADataSourceSAP"
,
HANA
(
"HDB"
,
"com.sap.db.jdbc.Driver"
,
"com.sap.db.jdbcext.XADataSourceSAP"
,
"SELECT 1 FROM DUMMY"
),
"SELECT 1 FROM DUMMY"
)
{
@Override
protected
Collection
<
String
>
getUrlPrefixes
()
{
return
Collections
.
singleton
(
"sap"
);
}
},
/**
/**
* jTDS. As it can be used for several databases, there isn't a single product name we
* jTDS. As it can be used for several databases, there isn't a single product name we
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverClassNameTests.java
View file @
34156b21
...
@@ -46,7 +46,7 @@ public class DatabaseDriverClassNameTests {
...
@@ -46,7 +46,7 @@ public class DatabaseDriverClassNameTests {
private
static
final
Set
<
DatabaseDriver
>
EXCLUDED_DRIVERS
=
Collections
private
static
final
Set
<
DatabaseDriver
>
EXCLUDED_DRIVERS
=
Collections
.
unmodifiableSet
(
EnumSet
.
of
(
DatabaseDriver
.
UNKNOWN
,
DatabaseDriver
.
ORACLE
,
.
unmodifiableSet
(
EnumSet
.
of
(
DatabaseDriver
.
UNKNOWN
,
DatabaseDriver
.
ORACLE
,
DatabaseDriver
.
DB2
,
DatabaseDriver
.
DB2_AS400
,
DatabaseDriver
.
INFORMIX
,
DatabaseDriver
.
DB2
,
DatabaseDriver
.
DB2_AS400
,
DatabaseDriver
.
INFORMIX
,
DatabaseDriver
.
SAP
,
DatabaseDriver
.
TERADATA
));
DatabaseDriver
.
HANA
,
DatabaseDriver
.
TERADATA
));
private
final
String
className
;
private
final
String
className
;
...
...
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java
View file @
34156b21
...
@@ -70,7 +70,7 @@ public class DatabaseDriverTests {
...
@@ -70,7 +70,7 @@ public class DatabaseDriverTests {
assertThat
(
DatabaseDriver
.
fromProductName
(
"Apache Derby"
))
assertThat
(
DatabaseDriver
.
fromProductName
(
"Apache Derby"
))
.
isEqualTo
(
DatabaseDriver
.
DERBY
);
.
isEqualTo
(
DatabaseDriver
.
DERBY
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"H2"
)).
isEqualTo
(
DatabaseDriver
.
H2
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"H2"
)).
isEqualTo
(
DatabaseDriver
.
H2
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"HDB"
)).
isEqualTo
(
DatabaseDriver
.
SAP
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"HDB"
)).
isEqualTo
(
DatabaseDriver
.
HANA
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"HSQL Database Engine"
))
assertThat
(
DatabaseDriver
.
fromProductName
(
"HSQL Database Engine"
))
.
isEqualTo
(
DatabaseDriver
.
HSQLDB
);
.
isEqualTo
(
DatabaseDriver
.
HSQLDB
);
assertThat
(
DatabaseDriver
.
fromProductName
(
"SQLite"
))
assertThat
(
DatabaseDriver
.
fromProductName
(
"SQLite"
))
...
@@ -124,7 +124,7 @@ public class DatabaseDriverTests {
...
@@ -124,7 +124,7 @@ public class DatabaseDriverTests {
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:jtds:sqlserver://127.0.0.1:1433/sample"
))
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:jtds:sqlserver://127.0.0.1:1433/sample"
))
.
isEqualTo
(
DatabaseDriver
.
JTDS
);
.
isEqualTo
(
DatabaseDriver
.
JTDS
);
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:sap:localhost"
))
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:sap:localhost"
))
.
isEqualTo
(
DatabaseDriver
.
SAP
);
.
isEqualTo
(
DatabaseDriver
.
HANA
);
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:sqlserver://127.0.0.1:1433"
))
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:sqlserver://127.0.0.1:1433"
))
.
isEqualTo
(
DatabaseDriver
.
SQLSERVER
);
.
isEqualTo
(
DatabaseDriver
.
SQLSERVER
);
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:firebirdsql://localhost/sample"
))
assertThat
(
DatabaseDriver
.
fromJdbcUrl
(
"jdbc:firebirdsql://localhost/sample"
))
...
...
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