root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Polish "Derive driverClassName from URL when otherwise unknown" 

See gh-39376
This commit is contained in:
Andy Wilkinson 2024-07-22 09:42:28 +01:00
parent 4611230d69
commit a12bfd9ec3
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -458,8 +458,8 @@ class DataSourceBuilderTests {
} }
@Test @Test
void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromDerivedUrl() { void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromUrl() {
UrlCapableLimitedCustomDataSource dataSource = new UrlCapableLimitedCustomDataSource(); NoDriverClassNameDataSource dataSource = new NoDriverClassNameDataSource();
dataSource.setUsername("test"); dataSource.setUsername("test");
dataSource.setPassword("secret"); dataSource.setPassword("secret");
dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres"); dataSource.setUrl("jdbc:postgresql://localhost:5432/postgres");
@ -471,6 +471,22 @@ class DataSourceBuilderTests {
assertThat(testSource.getDriver()).isInstanceOf(org.postgresql.Driver.class); assertThat(testSource.getDriver()).isInstanceOf(org.postgresql.Driver.class);
} }
@Test
void buildWhenDerivedFromCustomTypeDeriveDriverClassNameFromOverridenUrl() {
NoDriverClassNameDataSource dataSource = new NoDriverClassNameDataSource();
dataSource.setUsername("test");
dataSource.setPassword("secret");
dataSource.setUrl("jdbc:mysql://localhost:5432/mysql");
DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(dataSource)
.type(SimpleDriverDataSource.class)
.url("jdbc:mariadb://localhost:5432/mariadb");
SimpleDriverDataSource testSource = (SimpleDriverDataSource) builder.build();
assertThat(testSource.getUsername()).isEqualTo("test");
assertThat(testSource.getUrl()).isEqualTo("jdbc:mariadb://localhost:5432/mariadb");
assertThat(testSource.getPassword()).isEqualTo("secret");
assertThat(testSource.getDriver()).isInstanceOf(org.mariadb.jdbc.Driver.class);
}
@Test // gh-31920 @Test // gh-31920
void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() { void buildWhenC3P0TypeSpecifiedReturnsExpectedDataSource() {
this.dataSource = DataSourceBuilder.create() this.dataSource = DataSourceBuilder.create()
@ -634,7 +650,7 @@ class DataSourceBuilderTests {
} }
static class UrlCapableLimitedCustomDataSource extends LimitedCustomDataSource { static class NoDriverClassNameDataSource extends LimitedCustomDataSource {
private String url; private String url;
@ -648,10 +664,11 @@ class DataSourceBuilderTests {
} }
static class CustomDataSource extends UrlCapableLimitedCustomDataSource { static class CustomDataSource extends LimitedCustomDataSource {
private String driverClassName; private String driverClassName;
private String url;
String getDriverClassName() { String getDriverClassName() {
return this.driverClassName; return this.driverClassName;
@ -661,6 +678,14 @@ class DataSourceBuilderTests {
this.driverClassName = driverClassName; this.driverClassName = driverClassName;
} }
String getUrl() {
return this.url;
}
void setUrl(String url) {
this.url = url;
}
} }
} }