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

Merge branch '2.0.x'

This commit is contained in:
Stephane Nicoll 2018-05-14 08:13:40 +02:00
parent fccfa97ba3 d96724077c
commit 15edd02e1d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
View File

@ -240,17 +240,11 @@ public class JpaProperties {
private String determineDdlAuto(Map<String, String> existing, private String determineDdlAuto(Map<String, String> existing,
Supplier<String> defaultDdlAuto) { Supplier<String> defaultDdlAuto) {
if (!existing.containsKey("hibernate.hbm2ddl.auto")) { String ddlAuto = existing.get("hibernate.hbm2ddl.auto");
String ddlAuto = (this.ddlAuto != null ? this.ddlAuto if (ddlAuto != null) {
: defaultDdlAuto.get()); return ddlAuto;
if (!"none".equals(ddlAuto)) {
return ddlAuto;
}
} }
if (existing.containsKey("hibernate.hbm2ddl.auto")) { return this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get();
return existing.get("hibernate.hbm2ddl.auto");
}
return "none";
} }
} }