Skip to content

Commit 2a8a374

Browse files
committed
Merge DriverClassNameProvider in DatabaseDriver
DriverClassNameProvider is unused but was probably restored by a merge commit at some point. It wasn't obvious and updated that class rather than `DatabaseDriver`. This commit updates `DatabaseDriver` and deletes `DriverClassNameProvider`. Closes gh-5076
1 parent ec8f7d3 commit 2a8a374

File tree

2 files changed

+12
-75
lines changed

2 files changed

+12
-75
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ enum DatabaseDriver {
9090
SQLSERVER("com.microsoft.sqlserver.jdbc.SQLServerDriver",
9191
"com.microsoft.sqlserver.jdbc.SQLServerXADataSource"),
9292

93+
/**
94+
* Firebird.
95+
*/
96+
FIREBIRD("org.firebirdsql.jdbc.FBDriver",
97+
"org.firebirdsql.pool.FBConnectionPoolDataSource"),
98+
9399
/**
94100
* DB2 Server.
95101
*/
@@ -99,7 +105,12 @@ enum DatabaseDriver {
99105
* DB2 AS400 Server.
100106
*/
101107
AS400("com.ibm.as400.access.AS400JDBCDriver",
102-
"com.ibm.as400.access.AS400JDBCXADataSource");
108+
"com.ibm.as400.access.AS400JDBCXADataSource"),
109+
110+
/**
111+
* Teradata.
112+
*/
113+
TERADATA("com.teradata.jdbc.TeraDriver");
103114

104115
private final String driverClassName;
105116

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

Lines changed: 0 additions & 74 deletions
This file was deleted.

0 commit comments

Comments
 (0)