Commit aa60d60b authored by Johnny Lim's avatar Johnny Lim Committed by Stephane Nicoll

Polish JpaProperties.determineDdlAuto()

Closes gh-13036
parent b4258ea9
......@@ -240,17 +240,11 @@ public class JpaProperties {
private String determineDdlAuto(Map<String, String> existing,
Supplier<String> defaultDdlAuto) {
if (!existing.containsKey("hibernate.hbm2ddl.auto")) {
String ddlAuto = (this.ddlAuto != null ? this.ddlAuto
: defaultDdlAuto.get());
if (!"none".equals(ddlAuto)) {
return ddlAuto;
}
String ddlAuto = existing.get("hibernate.hbm2ddl.auto");
if (ddlAuto != null) {
return ddlAuto;
}
if (existing.containsKey("hibernate.hbm2ddl.auto")) {
return existing.get("hibernate.hbm2ddl.auto");
}
return "none";
return this.ddlAuto != null ? this.ddlAuto : defaultDdlAuto.get();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment