Handle lazy connection proxy datasource in DataSourceBuilder

See gh-50271

Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>

Author: vpavic

module/spring-boot-jdbc/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java

@@ -41,6 +41,7 @@
 
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.ResolvableType;
+import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
@@ -241,6 +242,10 @@ public static DataSourceBuilder<?> derivedFrom(DataSource dataSource) {
 	}
 
 	private static DataSource unwrap(DataSource dataSource) {
+		if ((dataSource instanceof LazyConnectionDataSourceProxy dataSourceProxy)
+				&& (dataSourceProxy.getTargetDataSource() != null)) {
+			dataSource = dataSourceProxy.getTargetDataSource();
+		}
 		try {
 			while (dataSource.isWrapperFor(DataSource.class)) {
 				DataSource unwrapped = dataSource.unwrap(DataSource.class);

module/spring-boot-jdbc/src/test/java/org/springframework/boot/jdbc/DataSourceBuilderTests.java

@@ -46,6 +46,7 @@
 import org.vibur.dbcp.ViburDBCPDataSource;
 
 import org.springframework.jdbc.datasource.AbstractDataSource;
+import org.springframework.jdbc.datasource.LazyConnectionDataSourceProxy;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
@@ -61,6 +62,7 @@
  * @author Stephane Nicoll
  * @author Fabio Grassi
  * @author Phillip Webb
+ * @author Vedran Pavic
  */
 class DataSourceBuilderTests {
 
@@ -427,6 +429,19 @@ void buildWhenDerivedFromWrappedDataSource() {
 		assertThat(built.getJdbcUrl()).isEqualTo("jdbc:h2:test");
 	}
 
+	@Test
+	void buildWhenDerivedFromLazyConnectionDataSourceProxy() {
+		HikariDataSource dataSource = new HikariDataSource();
+		dataSource.setUsername("test");
+		dataSource.setPassword("secret");
+		dataSource.setJdbcUrl("jdbc:h2:test");
+		DataSourceBuilder<?> builder = DataSourceBuilder.derivedFrom(new LazyConnectionDataSourceProxy(dataSource));
+		HikariDataSource built = (HikariDataSource) builder.username("test2").password("secret2").build();
+		assertThat(built.getUsername()).isEqualTo("test2");
+		assertThat(built.getPassword()).isEqualTo("secret2");
+		assertThat(built.getJdbcUrl()).isEqualTo("jdbc:h2:test");
+	}
+
 	@Test // gh-26644
 	void buildWhenDerivedFromExistingDatabaseWithTypeChange() {
 		HikariDataSource dataSource = new HikariDataSource();

module/spring-boot-liquibase/src/test/java/org/springframework/boot/liquibase/autoconfigure/LiquibaseAutoConfigurationTests.java

@@ -51,6 +51,7 @@
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.jdbc.DataSourceBuilder;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import org.springframework.boot.jdbc.autoconfigure.EmbeddedDataSourceConfiguration;
 import org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails;
 import org.springframework.boot.jdbc.autoconfigure.JdbcTemplateAutoConfiguration;
@@ -90,6 +91,7 @@
  * @author Moritz Halbritter
  * @author Phillip Webb
  * @author Ahmed Ashour
+ * @author Vedran Pavic
  */
 @ExtendWith(OutputCaptureExtension.class)
 class LiquibaseAutoConfigurationTests {
@@ -373,6 +375,20 @@ void overrideUser() {
 			}));
 	}
 
+	@Test
+	@WithDbChangelogMasterYamlResource
+	void lazyConnectionDataSource() {
+		String jdbcUrl = "jdbc:h2:mem:liquibase-" + UUID.randomUUID();
+		this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
+			.withPropertyValues("spring.datasource.url:" + jdbcUrl, "spring.datasource.username:not-sa",
+					"spring.datasource.connection-fetch:lazy", "spring.liquibase.user:sa")
+			.run(assertLiquibase((liquibase) -> {
+				SimpleDriverDataSource dataSource = (SimpleDriverDataSource) liquibase.getDataSource();
+				assertThat(dataSource.getUrl()).isEqualTo(jdbcUrl);
+				assertThat(dataSource.getUsername()).isEqualTo("sa");
+			}));
+	}
+
 	@Test
 	@WithDbChangelogMasterYamlResource
 	void overrideUserWhenCustom() {