Document how to re-enable DataSource auto-config when using R2DBC

wilkinsona · wilkinsona · commit f81e8909faae · 2020-07-30T18:06:13.000+01:00
Closes gh-22094
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
@@ -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.
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -4055,7 +4055,8 @@ The following examples shows how to set some PostgreSQL connection options:`
`4055`	`4055`	`}`
`4056`	`4056`	`----`
`4057`	`4057`
`4058`		-When a `ConnectionFactory` bean is available, the regular jdbc `DataSource` auto-configuration backs off.
	`4058`	+When a `ConnectionFactory` bean is available, the regular JDBC `DataSource` auto-configuration backs off.
	`4059`	+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.
`4059`	`4060`
`4060`	`4061`
`4061`	`4062`