Derive driverClassName from URL when otherwise unknown
See gh-39376
This commit is contained in:
parent
82706ac91a
commit
4611230d69
|
@ -186,8 +186,8 @@ public final class DataSourceBuilder<T extends DataSource> {
|
||||||
}
|
}
|
||||||
if (!applied.contains(DataSourceProperty.DRIVER_CLASS_NAME)
|
if (!applied.contains(DataSourceProperty.DRIVER_CLASS_NAME)
|
||||||
&& properties.canSet(DataSourceProperty.DRIVER_CLASS_NAME)
|
&& properties.canSet(DataSourceProperty.DRIVER_CLASS_NAME)
|
||||||
&& this.values.containsKey(DataSourceProperty.URL)) {
|
&& applied.contains(DataSourceProperty.URL)) {
|
||||||
String url = this.values.get(DataSourceProperty.URL);
|
String url = properties.get(dataSource, DataSourceProperty.URL);
|
||||||
DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
|
DatabaseDriver driver = DatabaseDriver.fromJdbcUrl(url);
|
||||||
properties.set(dataSource, DataSourceProperty.DRIVER_CLASS_NAME, driver.getDriverClassName());
|
properties.set(dataSource, DataSourceProperty.DRIVER_CLASS_NAME, driver.getDriverClassName());
|
||||||
}
|
}
|
||||||
|
|
|
@ -457,6 +457,20 @@ class DataSourceBuilderTests {
|
||||||
assertThat(testSource.getPassword()).isEqualTo("secret");
|
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
|
@Test // gh-31920
|
||||||
void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() {
|
void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() {
|
||||||
this.dataSource = DataSourceBuilder.create()
|
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 url;
|
||||||
|
|
||||||
private String driverClassName;
|
|
||||||
|
|
||||||
String getUrl() {
|
String getUrl() {
|
||||||
return this.url;
|
return this.url;
|
||||||
}
|
}
|
||||||
|
@ -634,6 +646,13 @@ class DataSourceBuilderTests {
|
||||||
this.url = url;
|
this.url = url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
static class CustomDataSource extends UrlCapableLimitedCustomDataSource {
|
||||||
|
|
||||||
|
private String driverClassName;
|
||||||
|
|
||||||
|
|
||||||
String getDriverClassName() {
|
String getDriverClassName() {
|
||||||
return this.driverClassName;
|
return this.driverClassName;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue