Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_44

This commit is contained in:
Andrea Boriero 2020-06-16 08:23:55 +01:00
parent bf575ef065 180656e9f3
commit cfc1de9de6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/src/main/asciidoc/userguide/appendices/Configurations.adoc
View File

@ -832,7 +832,7 @@ See https://docs.jboss.org/hibernate/orm/{majorMinorVersion}/javadocs/org/hibern
+ +
If no value is specified, a default is assumed as follows: If no value is specified, a default is assumed as follows:
+ +
* if source scripts are specified (per `javax.persistence.schema-generation.create-script-source`), then the `script` option is assumed * if source scripts are specified (per `javax.persistence.schema-generation.drop-script-source`), then the `script` option is assumed
* otherwise, `metadata` is assumed * otherwise, `metadata` is assumed
`*javax.persistence.schema-generation.create-script-source*`:: `*javax.persistence.schema-generation.create-script-source*`::

4
hibernate-core/src/main/java/org/hibernate/tool/schema/SourceType.java
View File

@ -33,7 +33,7 @@ public enum SourceType {
*/ */
SCRIPT( "script" ), SCRIPT( "script" ),
/** /**
* "metadata-then-scripts" - Both the O/RM metadata and external DDL scripts are used as sources for generation, * "metadata-then-script" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
* with the O/RM metadata being applied first. * with the O/RM metadata being applied first.
* *
* @see #METADATA * @see #METADATA
@ -41,7 +41,7 @@ public enum SourceType {
*/ */
METADATA_THEN_SCRIPT( "metadata-then-script" ), METADATA_THEN_SCRIPT( "metadata-then-script" ),
/** /**
* "scripts-then-metadata" - Both the O/RM metadata and external DDL scripts are used as sources for generation, * "script-then-metadata" - Both the O/RM metadata and external DDL scripts are used as sources for generation,
* with the commands from the external DDL script(s) being applied first * with the commands from the external DDL script(s) being applied first
* *
* @see #SCRIPT * @see #SCRIPT