From f81e8909faae8c0136c307ed2bfdcbf8ac7604d4 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 30 Jul 2020 18:06:13 +0100 Subject: [PATCH] Document how to re-enable DataSource auto-config when using R2DBC Closes gh-22094 --- .../src/docs/asciidoc/spring-boot-features.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc index 6a41a86032d..72b2faafb41 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc @@ -4055,7 +4055,8 @@ The following examples shows how to set some PostgreSQL connection options: } ---- -When a `ConnectionFactory` bean is available, the regular jdbc `DataSource` auto-configuration backs off. +When a `ConnectionFactory` bean is available, the regular JDBC `DataSource` auto-configuration backs off. +If you want to retain the JDBC `DataSource` auto-configuration, and are comfortable with the risk of using the blocking JDBC API in a reactive application, add `@Import(DataSourceAutoConfiguration.class)` on a `@Configuration` class in your application to re-enable it.