Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
d9672407
Commit
d9672407
authored
May 14, 2018
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13036 from izeye:polish-ddl-auto
* pr/13036: Polish JpaProperties.determineDdlAuto()
parents
b4258ea9
aa60d60b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
JpaProperties.java
...ngframework/boot/autoconfigure/orm/jpa/JpaProperties.java
+4
-10
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaProperties.java
View file @
d9672407
...
...
@@ -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
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment