Merge branch '2.3.x' into 2.4.x

Closes gh-26024
spring-projects · Apr 12, 2021 · fd6ad5b · fd6ad5b
2 parents b2d167c + 7286c33
commit fd6ad5b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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
@@ -7522,6 +7522,9 @@ The following example shows a typical setup for using Cassandra tests in Spring
 You can use the `@DataJpaTest` annotation to test JPA applications.
 By default, it scans for `@Entity` classes and configures Spring Data JPA repositories.
 If an embedded database is available on the classpath, it configures one as well.
+SQL queries are logged by default by setting the `spring.jpa.show-sql` property to `true`.
+This can be disabled using the `showSql()` attribute of the annotation.
+
 Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataJpaTest` annotation is used.
 `@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans.
 

diff --git a/...figure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java b/...figure/src/main/java/org/springframework/boot/test/autoconfigure/orm/jpa/DataJpaTest.java
@@ -53,6 +53,10 @@
  * {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} annotation can be used to
  * override these settings.
  * <p>
+ * SQL queries are logged by default by setting the {@code spring.jpa.show-sql} property
+ * to {@code true}. This can be disabled using the {@link DataJpaTest#showSql() showSql}
+ * attribute.
+ * <p>
  * If you are looking to load your full application configuration, but use an embedded
  * database, you should consider {@link SpringBootTest @SpringBootTest} combined with
  * {@link AutoConfigureTestDatabase @AutoConfigureTestDatabase} rather than this