Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make DataSourceBuilder be able to derive driverClassName from derived url from provided Datasource

Browse Source
This commit is contained in:
Ronald Mik 2024-02-01 20:29:15 +01:00
parent ff97fdc203
commit c8b0498673
No known key found for this signature in database
GPG Key ID: 42F0CC656E509299
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
View File

@ -186,8 +186,8 @@ public final class DataSourceBuilder<T extends DataSource> {
}
if (!applied.contains(DataSourceProperty.DRIVER_CLASS_NAME)
&& properties.canSet(DataSourceProperty.DRIVER_CLASS_NAME)
&& this.values.containsKey(DataSourceProperty.URL)) {
String url = this.values.get(DataSourceProperty.URL);
&& applied.contains(DataSourceProperty.URL)) {
String url = properties.get(dataSource, DataSourceProperty.URL);
DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
properties.set(dataSource, DataSourceProperty.DRIVER_CLASS_NAME, driver.getDriverClassName());
}

25
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java
View File

@ -457,6 +457,20 @@ class DataSourceBuilderTests {
assertThat(testSource.getPassword()).isEqualTo("secret");
}
@Test
void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromDerivedUrl() {
UrlCapableLimitedCustomDataSource dataSource = new UrlCapableLimitedCustomDataSource();
dataSource.setUsername("test");
dataSource.setPassword("secret");
dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres");
DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(dataSource).type(SimpleDriverDataSource.class);
SimpleDriverDataSource testSource = (SimpleDriverDataSource) builder.build();
assertThat(testSource.getUsername()).isEqualTo("test");
assertThat(testSource.getUrl()).isEqualTo("jdbc:postgresql://localhost:5432/postgres");
assertThat(testSource.getPassword()).isEqualTo("secret");
assertThat(testSource.getDriver()).isInstanceOf(org.postgresql.Driver.class);
}
@Test // gh-31920
void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() {
this.dataSource = DataSourceBuilder.create()
@ -620,12 +634,10 @@ class DataSourceBuilderTests {
}
static class CustomDataSource extends LimitedCustomDataSource {
static class UrlCapableLimitedCustomDataSource extends LimitedCustomDataSource {
private String url;
private String driverClassName;
String getUrl() {
return this.url;
}
@ -634,6 +646,13 @@ class DataSourceBuilderTests {
this.url = url;
}
}
static class CustomDataSource extends UrlCapableLimitedCustomDataSource {
private String driverClassName;
String getDriverClassName() {
return this.driverClassName;
}