The original implementation of GORM, GORM for Hibernate provides all the goodness of GORM for SQL databases.
-- Documentation - API - Source +
- Documentation - API - Source
diff --git a/docs/guide-rx/src/main/docs/gettingStarted/CRUD.adoc b/docs/guide-rx/src/main/docs/gettingStarted/CRUD.adoc index c74d9e25ded..0bd824c0fec 100644 --- a/docs/guide-rx/src/main/docs/gettingStarted/CRUD.adoc +++ b/docs/guide-rx/src/main/docs/gettingStarted/CRUD.adoc @@ -60,7 +60,7 @@ Book.get(id) } ---- -The `switchMap` transforms an `Observable` and converts the result into another `Observable`. However, this is not the most efficient way to perform updates as you can use https://gorm.grails.org/latest/hibernate/manual/index.html#whereQueries[where queries] to update an instance without retrieving it: +The `switchMap` transforms an `Observable` and converts the result into another `Observable`. However, this is not the most efficient way to perform updates as you can use https://gorm.grails.org/latest/hibernate5/manual/index.html#whereQueries[where queries] to update an instance without retrieving it: [source,groovy] diff --git a/docs/guide-rx/src/main/docs/querying/dynamicFinders.adoc b/docs/guide-rx/src/main/docs/querying/dynamicFinders.adoc index 2d4a4a7fdb6..c4ebe946d28 100644 --- a/docs/guide-rx/src/main/docs/querying/dynamicFinders.adoc +++ b/docs/guide-rx/src/main/docs/querying/dynamicFinders.adoc @@ -1,5 +1,5 @@ === Dynamic Finders -Although _Where queries_ are preferred, _Dynamic finders_ are another option for simple queries and are also very expressive. The https://gorm.grails.org/latest/hibernate/manual/index.html#finders[syntax for Dynamic finders is described in the GORM user guide]. The major difference in RxGORM is that all dynamic finders return an `rx.Observable`: +Although _Where queries_ are preferred, _Dynamic finders_ are another option for simple queries and are also very expressive. The https://gorm.grails.org/latest/hibernate5/manual/index.html#finders[syntax for Dynamic finders is described in the GORM user guide]. The major difference in RxGORM is that all dynamic finders return an `rx.Observable`: [source,groovy] ---- diff --git a/docs/guide-rx/src/main/docs/querying/index.adoc b/docs/guide-rx/src/main/docs/querying/index.adoc index 9e7cbdd3362..b31bfe9c3b8 100644 --- a/docs/guide-rx/src/main/docs/querying/index.adoc +++ b/docs/guide-rx/src/main/docs/querying/index.adoc @@ -1,10 +1,10 @@ == Querying RxGORM supports all the typical ways of querying that you are used to with GORM including: -* https://gorm.grails.org/latest/hibernate/manual/index.html#finders[Dynamic finders] -* https://gorm.grails.org/latest/hibernate/manual/index.html#whereQueries[Where queries] -* https://gorm.grails.org/latest/hibernate/manual/index.html#detachedCriteria[Detached Criteria] -* https://gorm.grails.org/latest/hibernate/manual/index.html#criteria[Criteria queries] +* https://gorm.grails.org/latest/hibernate5/manual/index.html#finders[Dynamic finders] +* https://gorm.grails.org/latest/hibernate5/manual/index.html#whereQueries[Where queries] +* https://gorm.grails.org/latest/hibernate5/manual/index.html#detachedCriteria[Detached Criteria] +* https://gorm.grails.org/latest/hibernate5/manual/index.html#criteria[Criteria queries] The major difference is that all query operations return an `Observable`. In this section we will go through the various ways you can query for GORM objects. diff --git a/docs/guide-rx/src/main/docs/querying/whereQueries.adoc b/docs/guide-rx/src/main/docs/querying/whereQueries.adoc index b7d734aedbe..3d94c8d46ad 100644 --- a/docs/guide-rx/src/main/docs/querying/whereQueries.adoc +++ b/docs/guide-rx/src/main/docs/querying/whereQueries.adoc @@ -37,4 +37,4 @@ Book.where { title == 'The Stand' } } ---- -For more information on the syntax of where queries see the https://gorm.grails.org/latest/hibernate/manual/index.html#whereQueries[relevant section in the GORM documentation]. +For more information on the syntax of where queries see the https://gorm.grails.org/latest/hibernate5/manual/index.html#whereQueries[relevant section in the GORM documentation]. diff --git a/gradle.properties b/gradle.properties index aee53c6c69c..bd4aa553c7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,26 @@ projectVersion=9.0.0-SNAPSHOT - grailsVersion=7.0.0-SNAPSHOT javaVersion=17 asciidoctorVersion=4.0.4 +testcontainersMongodbVersion=1.20.1 commonsValidatorVersion=1.9.0 hibernateVersion=5.6.15.Final +grailsSpringSecurityVersion=7.0.0-SNAPSHOT +jbossTransactionApiVersion=2.0.0.Final +liquibaseHibernate5Version=4.27.0 +yakworksHibernateGroovyProxyVersion=1.1 jakartaElVersion=4.0.0 jakartaElGlassfishImplVersion=4.0.2 javassistVersion=3.30.2-GA +micronautPlatformVersion=4.6.3 +picocliVersion=4.7.6 + +# This prevents the Grails Gradle Plugin from unnecessarily excluding slf4j-simple in the generated POMs +# https://github.com/grails/grails-gradle-plugin/issues/222 +slf4jPreventExclusion=true org.gradle.caching=true org.gradle.parallel=true org.gradle.daemon=true +org.gradle.jvmargs=-Dfile.encoding=UTF-8 -Xmx1536M -XX:MaxMetaspaceSize=512M diff --git a/gradle/documentation-config.gradle b/gradle/documentation-config.gradle index 16436b758c3..abbc07ebdfd 100644 --- a/gradle/documentation-config.gradle +++ b/gradle/documentation-config.gradle @@ -56,10 +56,36 @@ tasks.register('data-mapping-groovydoc', Groovydoc) { } } +tasks.register('copyMongodbDocs', Copy) { + dependsOn(':mongodb-docs:docs') + + def mongodbSourceDir = project(':mongodb-docs').layout.buildDirectory.dir('docs') + def targetDir = rootProject.layout.buildDirectory.dir('docs/mongodb') + + from(mongodbSourceDir) + into(targetDir) + + inputs.dir(mongodbSourceDir) + outputs.dir(targetDir) +} + +tasks.register('copyHibernate5Docs', Copy) { + dependsOn(':hibernate5-docs:docs') + + def hibernate5SourceDir = project('::hibernate5-docs').layout.buildDirectory.dir('docs') + def targetDir = rootProject.layout.buildDirectory.dir('docs/hibernate5') + + from(hibernate5SourceDir) + into(targetDir) + + inputs.dir(hibernate5SourceDir) + outputs.dir(targetDir) +} + tasks.register('docs') { group = 'documentation' dependsOn(':data-mapping-groovydoc') - finalizedBy('copyRootWebsite','copyGuides') + finalizedBy('copyRootWebsite','copyGuides', 'copyMongodbDocs', 'copyHibernate5Docs') } tasks.register('copyRootWebsite', Copy) { diff --git a/gradle/example-config.gradle b/gradle/example-config.gradle new file mode 100644 index 00000000000..c94729090f4 --- /dev/null +++ b/gradle/example-config.gradle @@ -0,0 +1,3 @@ +tasks.withType(Groovydoc).configureEach { + enabled = false +} \ No newline at end of file diff --git a/gradle/hibernate5-test-config.gradle b/gradle/hibernate5-test-config.gradle new file mode 100644 index 00000000000..70a680c5a88 --- /dev/null +++ b/gradle/hibernate5-test-config.gradle @@ -0,0 +1,53 @@ +dependencies { + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.withType(Test).configureEach { + onlyIf { + if (project.hasProperty('skipHibernate5Tests')) { + return false + } + + if (project.hasProperty('onlyMongodbTests')) { + return false + } + + if (project.hasProperty('onlyDatastoreTests')) { + return false + } + + true + } + + useJUnitPlatform() + systemProperty('hibernate5.gorm.suite', System.getProperty('hibernate5.gorm.suite') ?: true) + reports.html.required = !System.getenv('CI') + reports.junitXml.required = !System.getenv('CI') + testLogging { + events('passed', 'skipped', 'failed') + showExceptions = true + exceptionFormat = 'full' + showCauses = true + showStackTraces = true + + // set options for log level DEBUG and INFO + debug { + events('started', 'passed', 'skipped', 'failed', 'standardOut', 'standardError') + exceptionFormat = 'full' + } + info.events = debug.events + info.exceptionFormat = debug.exceptionFormat + } + afterTest { desc, result -> + logger.quiet(' -- Executed test {} [{}] with result: {}', desc.name, desc.className, result.resultType) + } + afterSuite { desc, result -> + if (!desc.parent) { // will match the outermost suite + def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)" + def startItem = '| ', endItem = ' |' + def repeatLength = startItem.length() + output.length() + endItem.length() + def dashes = '-' * repeatLength + logger.quiet('\n{}\n{}{}{}\n{}', dashes, startItem, output, endItem, dashes) + } + } +} diff --git a/gradle/java-config.gradle b/gradle/java-config.gradle index 7c2c0520fcc..b21e27e62aa 100644 --- a/gradle/java-config.gradle +++ b/gradle/java-config.gradle @@ -3,4 +3,12 @@ compileJava.options.release = javaVersion.toInteger() java { withSourcesJar() withJavadocJar() +} + +// work around for parallel builds due to https://github.com/bertramdev/asset-pipeline/issues/177 +if('assetCompile' in tasks.names) { + TaskProvider
+ *
+ * SomeEntity.withNewTransaction([isolationLevel: TransactionDefinition.ISOLATION_REPEATABLE_READ]) {
+ * // ...
+ * }
+ *
+ *
+ *
+ * @param transactionProperties properties to configure the transaction properties
+ * @param callable The closure to call
+ * @return The result of the closure execution
+ * @see DefaultTransactionDefinition
+ * @see #withNewTransaction(Closure)
+ * @see #withTransaction(Closure)
+ * @see #withTransaction(Map, Closure)
+ */
+ void withNewTransaction(Map transactionProperties, Closure callable) {
+ def props = new HashMap(transactionProperties)
+ props.remove 'propagationName'
+ props.propagationBehavior = TransactionDefinition.PROPAGATION_REQUIRES_NEW
+ withTransaction(props, callable)
+ }
+
+ void withTransaction(Map transactionProperties, Closure callable) {
+ def transactionDefinition = new DefaultTransactionDefinition()
+ transactionProperties.each { k, v ->
+ if(v instanceof CharSequence && !(v instanceof String)) {
+ v = v.toString()
+ }
+ try {
+ transactionDefinition[k as String] = v
+ } catch (MissingPropertyException mpe) {
+ throw new IllegalArgumentException("[${k}] is not a valid transaction property.", mpe)
+ }
+ }
+ withTransaction(transactionDefinition, callable)
+ }
+
+ /**
+ * Executes the closure within the context of a transaction for the given {@link TransactionDefinition}
+ *
+ * @param callable The closure to call
+ * @return The result of the closure execution
+ */
+ void withTransaction(TransactionDefinition definition, Closure callable) {
+ Assert.notNull transactionManager, "No transactionManager bean configured"
+
+ if (!callable) {
+ return
+ }
+
+ new GrailsTransactionTemplate(transactionManager, definition).execute(callable)
+ }
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy
new file mode 100644
index 00000000000..db16cafd039
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/EnvironmentAwareCodeGenConfig.groovy
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.plugins.databasemigration
+
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+import org.grails.config.CodeGenConfig
+
+@CompileStatic
+class EnvironmentAwareCodeGenConfig extends CodeGenConfig {
+
+ EnvironmentAwareCodeGenConfig(CodeGenConfig copyOf, String environment) {
+ super(copyOf)
+ mergeEnvironmentConfig(copyOf, environment)
+ }
+
+ @CompileDynamic
+ private void mergeEnvironmentConfig(CodeGenConfig copyOf, String environment) {
+ mergeMap(copyOf.environments?."$environment" ?: [:])
+ }
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy
new file mode 100644
index 00000000000..744438182c2
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/NoopVisitor.groovy
@@ -0,0 +1,24 @@
+package org.grails.plugins.databasemigration
+
+import liquibase.changelog.ChangeSet
+import liquibase.changelog.DatabaseChangeLog
+import liquibase.changelog.filter.ChangeSetFilterResult
+import liquibase.changelog.visitor.ChangeSetVisitor
+import liquibase.database.Database
+import liquibase.exception.LiquibaseException
+
+class NoopVisitor implements ChangeSetVisitor {
+
+ protected Database database
+
+ NoopVisitor(Database database) {
+ this.database = database
+ }
+
+ Direction getDirection() { Direction.FORWARD }
+
+ @Override
+ void visit(ChangeSet changeSet, DatabaseChangeLog databaseChangeLog, Database database, SetSql instance from the current connection.
+ *
+ * @return the sql instance
+ */
+ Sql getSql() {
+ if (!connection) {
+ return null
+ }
+
+ if (!sql) {
+ sql = new Sql(connection) {
+ protected void closeResources(Connection c) {
+ // do nothing, let Liquibase close the connection
+ }
+ }
+ }
+
+ sql
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut to get the (wrapper) database connection.
+ *
+ * @return the connection or null if the database isn't set yet
+ */
+ DatabaseConnection getDatabaseConnection() {
+ database?.connection
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut to get the real database connection.
+ *
+ * @return the connection or null if the database isn't set yet
+ */
+ Connection getConnection() {
+ if (databaseConnection instanceof JdbcConnection) {
+ return ((JdbcConnection) database.connection).underlyingConnection
+ }
+ return null
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut for the current application.
+ *
+ * @return the application
+ */
+ GrailsApplication getApplication() {
+ ctx.getBean(GrailsApplication)
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut for the current config.
+ *
+ * @return the config
+ */
+ Config getConfig() {
+ application.config
+ }
+
+ /**
+ *
+ * @return Whether the database executor is instance of LoggingExecutor
+ */
+ protected boolean shouldRun() {
+ !(Scope.getCurrentScope().getSingleton(ExecutorService.class).getExecutor("jdbc", database) instanceof LoggingExecutor)
+ }
+
+ /**
+ * Executes the grailsChange>change block within the context of a new transaction
+ *
+ * @param callable The changeClosure to call
+ * @return The result of the closure execution
+ */
+ protected void withNewTransaction(Closure callable) {
+ new DatabaseMigrationTransactionManager(ctx, dataSourceName)
+ .withNewTransaction callable
+ }
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy
new file mode 100644
index 00000000000..12d8e4e37a6
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogParser.groovy
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2015 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.plugins.databasemigration.liquibase
+
+import grails.config.ConfigMap
+import grails.io.IOUtils
+import groovy.transform.CompileDynamic
+import groovy.transform.CompileStatic
+import liquibase.changelog.ChangeLogParameters
+import liquibase.exception.ChangeLogParseException
+import liquibase.parser.core.ParsedNode
+import liquibase.parser.core.xml.AbstractChangeLogParser
+import liquibase.resource.ResourceAccessor
+import org.codehaus.groovy.control.CompilerConfiguration
+import org.springframework.context.ApplicationContext
+
+import static org.grails.plugins.databasemigration.PluginConstants.DATA_SOURCE_NAME_KEY
+
+@CompileStatic
+class GroovyChangeLogParser extends AbstractChangeLogParser {
+
+ final int priority = PRIORITY_DEFAULT
+
+ ApplicationContext applicationContext
+
+ ConfigMap config
+
+ @Override
+ @CompileDynamic
+ protected ParsedNode parseToNode(String physicalChangeLogLocation, ChangeLogParameters changeLogParameters, ResourceAccessor resourceAccessor) throws ChangeLogParseException {
+ def inputStream = null
+ def changeLogText = null
+ try {
+ inputStream = resourceAccessor.openStreams(null, physicalChangeLogLocation).first()
+ changeLogText = inputStream?.text
+ } finally {
+ IOUtils.closeQuietly(inputStream)
+ }
+
+ CompilerConfiguration compilerConfiguration = new CompilerConfiguration(CompilerConfiguration.DEFAULT)
+ if (compilerConfiguration.metaClass.respondsTo(compilerConfiguration, 'setDisabledGlobalASTTransformations')) {
+ Set disabled = compilerConfiguration.disabledGlobalASTTransformations ?: []
+ disabled << 'org.grails.datastore.gorm.query.transform.GlobalDetachedCriteriaASTTransformation'
+ compilerConfiguration.disabledGlobalASTTransformations = disabled
+ }
+
+ def changeLogProperties = config.getProperty('changelogProperties', Map) ?: [:]
+
+ try {
+ GroovyClassLoader classLoader = new GroovyClassLoader(Thread.currentThread().contextClassLoader, compilerConfiguration, false)
+ Script script = new GroovyShell(classLoader, new Binding(changeLogProperties), compilerConfiguration).parse(changeLogText as String)
+ script.run()
+
+ setChangeLogProperties(changeLogProperties, changeLogParameters)
+
+ Closure databaseChangeLogBlock = script.getProperty('databaseChangeLog') as Closure
+
+ DatabaseChangeLogBuilder builder = new DatabaseChangeLogBuilder()
+ builder.dataSourceName = changeLogParameters.getValue(DATA_SOURCE_NAME_KEY, null)
+ builder.applicationContext = applicationContext
+ builder.databaseChangeLog(databaseChangeLogBlock) as ParsedNode
+ } catch (Exception e) {
+ throw new ChangeLogParseException(e)
+ }
+ }
+
+ @Override
+ boolean supports(String changeLogFile, ResourceAccessor resourceAccessor) {
+ changeLogFile.endsWith('.groovy')
+ }
+
+ @CompileDynamic
+ protected void setChangeLogProperties(Map changeLogProperties, ChangeLogParameters changeLogParameters) {
+ changeLogProperties.each { name, value ->
+ String contexts = null
+ String labels = null
+ String databases = null
+ if (value instanceof Map) {
+ contexts = value.contexts
+ labels = value.labels
+ databases = value.databases
+ value = value.value
+ }
+ changeLogParameters.set(name as String, value as String, contexts as String, labels, databases, true, null)
+ }
+ }
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy
new file mode 100644
index 00000000000..4a9ca326081
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChangeLogSerializer.groovy
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2015 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.grails.plugins.databasemigration.liquibase
+
+import groovy.transform.CompileStatic
+import liquibase.changelog.ChangeLogChild
+import liquibase.changelog.ChangeSet
+import liquibase.serializer.ChangeLogSerializer
+import liquibase.serializer.LiquibaseSerializable
+import liquibase.serializer.core.xml.XMLChangeLogSerializer
+
+@CompileStatic
+class GroovyChangeLogSerializer implements ChangeLogSerializer {
+
+ private XMLChangeLogSerializer xmlChangeLogSerializer = new XMLChangeLogSerializer()
+
+ @Override
+ def Sql instance from the current connection.
+ *
+ * @return the sql instance
+ */
+ Sql getSql() {
+ if (!connection) {
+ return null
+ }
+
+ if (!sql) {
+ sql = new Sql(connection) {
+ protected void closeResources(Connection c) {
+ // do nothing, let Liquibase close the connection
+ }
+ }
+ }
+
+ sql
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut to get the (wrapper) database connection.
+ *
+ * @return the connection or null if the database isn't set yet
+ */
+ DatabaseConnection getDatabaseConnection() {
+ database?.connection
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut to get the real database connection.
+ *
+ * @return the connection or null if the database isn't set yet
+ */
+ Connection getConnection() {
+ if (databaseConnection instanceof JdbcConnection) {
+ return ((JdbcConnection) database.connection).underlyingConnection
+ }
+ return null
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut for the current application.
+ *
+ * @return the application
+ */
+ GrailsApplication getApplication() {
+ ctx.getBean(GrailsApplication)
+ }
+
+ /**
+ * Called from the change or rollback closure. Shortcut for the current config.
+ *
+ * @return the config
+ */
+ Config getConfig() {
+ application.config
+ }
+
+ /**
+ * Called from the check closure as a shortcut to throw a PreconditionFailedException.
+ *
+ * @param message the failure message
+ */
+ void fail(String message) {
+ throw new PreconditionFailedException(message, changeLog, this)
+ }
+
+ /**
+ * Called from the check closure.
+ *
+ * @param schemaName the schema name
+ * @return a snapshot for the current database and schema name
+ */
+ DatabaseSnapshot createDatabaseSnapshot(String schemaName = null) {
+ try {
+ return SnapshotGeneratorFactory.instance.createSnapshot(new CatalogAndSchema(null, schemaName), database, new SnapshotControl(database))
+ } catch (DatabaseException e) {
+ throw new PreconditionErrorException(e, changeLog, this)
+ }
+ }
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.change.Change b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.change.Change
new file mode 100644
index 00000000000..28032a072dd
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.change.Change
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.GroovyChange
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.command.CommandStep b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.command.CommandStep
new file mode 100644
index 00000000000..57807cf02f8
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.command.CommandStep
@@ -0,0 +1,2 @@
+org.grails.plugins.databasemigration.liquibase.GroovyDiffToChangeLogCommandStep
+org.grails.plugins.databasemigration.liquibase.GroovyGenerateChangeLogCommandStep
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.database.Database b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.database.Database
new file mode 100644
index 00000000000..ac4dce94511
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.database.Database
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.GormDatabase
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser
new file mode 100644
index 00000000000..34140176c3e
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.parser.ChangeLogParser
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.GroovyChangeLogParser
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.precondition.Precondition b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.precondition.Precondition
new file mode 100644
index 00000000000..fef65c4e6ce
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.precondition.Precondition
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.GroovyPrecondition
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.resource.PathHandler b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.resource.PathHandler
new file mode 100644
index 00000000000..4675c5fdc95
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.resource.PathHandler
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.EmbeddedJarPathHandler
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer
new file mode 100644
index 00000000000..ea14cdd7d56
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/META-INF/services/liquibase.serializer.ChangeLogSerializer
@@ -0,0 +1 @@
+org.grails.plugins.databasemigration.liquibase.GroovyChangeLogSerializer
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/resources/migration.gdsl b/grails-data-hibernate5/database-migration/src/main/resources/migration.gdsl
new file mode 100644
index 00000000000..8622d7049ca
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/resources/migration.gdsl
@@ -0,0 +1,686 @@
+migrationDir = ".*/grails-app/migrations/.*"
+
+final String STRING = String.name
+
+contributor(context(pathRegexp: migrationDir, scope: scriptScope())) {
+ property name: "databaseChangeLog", type: {}
+}
+
+def changelogBody = context(scope: closureScope())
+contributor([changelogBody]) {
+ method name: "changeSet", params: [
+ args: [
+ parameter(name: 'id', type: STRING),
+ parameter(name: 'author', type: STRING),
+ parameter(name: 'dbms', type: STRING),
+ parameter(name: 'runAlways', type: STRING),
+ parameter(name: 'runOnChange', type: STRING),
+ parameter(name: 'context', type: STRING),
+ parameter(name: 'runInTransaction', type: STRING),
+ parameter(name: 'failOnError', type: STRING),
+ parameter(name: 'description', type: STRING)
+ ],
+ body: {}
+
+ ], type: void
+
+ method name: "include", params: [
+ args: [parameter(name: 'file', type: STRING)]
+ ], type: void
+}
+
+void provideChildsOf(String parentMethod, Closure callback) {
+ provideChildsOf(parentMethod, true, callback)
+}
+
+void provideChildsOf(String parentMethod, boolean isArg, Closure callback) {
+ def c = context(scope: closureScope(isArg: isArg), pathRegexp: migrationDir)
+
+ contributor([c]) {
+ if (enclosingCall(parentMethod)) {
+ Closure cloned = callback.clone()
+ cloned.delegate = delegate
+ cloned.call()
+ }
+ }
+}
+
+//Grails changes
+provideChildsOf("changeSet") {
+ method name: "grailsChange", params: [:], body: {}
+}
+
+provideChildsOf("grailsChange") {
+ method name: "init", params: [:], body: {}, type: void
+ method name: "validate", params: [:], body: {}, type: void
+ method name: "change", params: [:], body: {}, type: void
+ method name: "rollback", params: [:], body: {}, type: void
+ method name: "confirm", params: [:], body: {}, type: void
+ method name: "checkSum", params: [:], body: {}, type: void
+}
+
+provideChildsOf("change") {
+ property name: "changeSet", type: "liquibase.changelog.ChangeSet"
+ property name: "resourceAccessor", type: "liquibase.resource.ResourceAccessor"
+ property name: "ctx", type: "org.springframework.context.ApplicationContext"
+ property name: "application", type: "org.codehaus.groovy.grails.commons.GrailsApplication"
+ property name: "database", type: "liquibase.database.Database"
+ property name: "databaseConnection", type: "liquibase.database.DatabaseConnection"
+ property name: "connection", type: "java.sql.Connection"
+ property name: "sql", type: "groovy.sql.Sql"
+}
+
+provideChildsOf("rollback") {
+ property name: "database", type: "liquibase.database.Database"
+ property name: "databaseConnection", type: "liquibase.database.DatabaseConnection"
+ property name: "connection", type: "java.sql.Connection"
+ property name: "sql", type: "groovy.sql.Sql"
+}
+
+
+provideChildsOf("changeSet") {
+ method name: "sql", params: [query: "java.lang.String"], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "sqlFile", params: [
+ args: [
+ parameter(name: "dbms", type: STRING),
+ parameter(name: "encoding", type: STRING),
+ parameter(name: "endDelimiter", type: STRING),
+ parameter(name: "path", type: STRING),
+ parameter(name: "relativeToChangelogFile", type: STRING),
+ parameter(name: "splitStatements", type: STRING),
+ parameter(name: "stripComments", type: STRING),
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "createSequence", params: [
+ args: [
+ parameter(name: "catalogName", type: STRING),
+ parameter(name: "cycle", type: STRING),
+ parameter(name: "incrementBy", type: STRING),
+ parameter(name: "maxValue", type: STRING),
+ parameter(name: "minValue", type: STRING),
+ parameter(name: "ordered", type: STRING),
+ parameter(name: "schemaName", type: STRING),
+ parameter(name: "sequenceName", type: STRING),
+ parameter(name: "startValue", type: STRING)
+ ]
+ ], type: void
+}
+
+//liquibase changes
+List columnArgs = [
+ parameter(name: 'name', type: STRING),
+ parameter(name: 'type', type: STRING),
+ parameter(name: 'value', type: STRING),
+ parameter(name: 'valueNumeric', type: STRING),
+ parameter(name: 'valueBoolean', type: STRING),
+ parameter(name: 'valueDate', type: STRING),
+ parameter(name: 'defaultValue', type: STRING),
+ parameter(name: 'defaultValueNumeric', type: STRING),
+ parameter(name: 'defaultValueBoolean', type: STRING),
+ parameter(name: 'defaultValueDate', type: STRING),
+ parameter(name: 'autoIncrement', type: STRING),
+ parameter(name: 'beforeColumn', type: STRING),
+ parameter(name: 'afterColumn', type: STRING),
+ parameter(name: 'position', type: STRING),
+ parameter(name: 'descending', type: STRING),
+
+]
+
+columnType = {
+ method name: "column", params: [
+ args: columnArgs,
+ body: {}
+ ], type: void
+}
+
+columnTypeNoBody = {
+ method name: "column", params: [
+ args: columnArgs
+ ], type: void
+}
+
+List param = [
+ parameter(name: 'name', type: STRING),
+ parameter(name: 'value', type: STRING)
+]
+
+provideChildsOf("changeSet") {
+ method name: "createTable", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'remarks', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'tablespace', type: STRING),
+ ],
+ body: {}
+ ], type: void
+
+}
+provideChildsOf("createTable", columnType)
+provideChildsOf("createTable", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "createView", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'replaceIfExists', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'selectQuery', type: STRING),
+ parameter(name: 'viewName', type: STRING)
+ ]
+ ], type: void
+
+}
+
+provideChildsOf("column") {
+ method name: "constraints", params: [
+ args: [
+ parameter(name: 'nullable', type: STRING),
+ parameter(name: 'primaryKey', type: STRING),
+ parameter(name: 'primaryKeyName', type: STRING),
+ parameter(name: 'unique', type: STRING),
+ parameter(name: 'uniqueConstraintName', type: STRING),
+ parameter(name: 'references', type: STRING),
+ parameter(name: 'foreignKeyName', type: STRING),
+ parameter(name: 'deleteCascade', type: STRING),
+ parameter(name: 'deferrable', type: STRING),
+ parameter(name: 'initiallyDeferred', type: STRING)
+ ]
+ ], type: void
+}
+
+
+provideChildsOf("changeSet") {
+ method name: "addAutoIncrement", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'incrementBy', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'startWith', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+
+}
+
+provideChildsOf("changeSet") {
+ method name: "addColumn", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("addColumn", columnType)
+provideChildsOf("addColumn", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "addDefaultValue", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'defaultValue', type: STRING),
+ parameter(name: 'defaultValueBoolean', type: STRING),
+ parameter(name: 'defaultValueComputed', type: STRING),
+ parameter(name: 'defaultValueDate', type: STRING),
+ parameter(name: 'defaultValueNumeric', type: STRING),
+ parameter(name: 'defaultValueSequenceNext', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "addForeignKeyConstraint", params: [
+ args: [
+ parameter(name: 'baseColumnNames', type: STRING),
+ parameter(name: 'baseTableCatalogName', type: STRING),
+ parameter(name: 'baseTableName', type: STRING),
+ parameter(name: 'baseTableSchemaName', type: STRING),
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'deferrable', type: STRING),
+ parameter(name: 'initiallyDeferred', type: STRING),
+ parameter(name: 'onDelete', type: STRING),
+ parameter(name: 'onUpdate', type: STRING),
+ parameter(name: 'referencedColumnNames', type: STRING),
+ parameter(name: 'referencedTableCatalogName', type: STRING),
+ parameter(name: 'referencedTableName', type: STRING),
+ parameter(name: 'referencedTableSchemaName', type: STRING),
+ parameter(name: 'referencesUniqueColumn', type: STRING),
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "addNotNullConstraint", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'defaultNullValue', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "addPrimaryKey", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnNames', type: STRING),
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'tablespace', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "addUniqueConstraint", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnNames', type: STRING),
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'deferrable', type: STRING),
+ parameter(name: 'disabled', type: STRING),
+ parameter(name: 'initiallyDeferred', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'tablespace', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "createIndex", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'indexName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'tablespace', type: STRING),
+ parameter(name: 'unique', type: STRING),
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("createIndex", columnType)
+provideChildsOf("createIndex", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "delete", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'where', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropAllForeignKeyConstraints", params: [
+ args: [
+ parameter(name: 'baseTableCatalogName', type: STRING),
+ parameter(name: 'baseTableName', type: STRING),
+ parameter(name: 'baseTableSchemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropColumn", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropDefaultValue", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropForeignKeyConstraint", params: [
+ args: [
+ parameter(name: 'baseTableCatalogName', type: STRING),
+ parameter(name: 'baseTableName', type: STRING),
+ parameter(name: 'baseTableSchemaName', type: STRING),
+ parameter(name: 'constraintName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropIndex", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'indexName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropNotNullConstraint", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropPrimaryKey", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropTable", params: [
+ args: [
+ parameter(name: 'cascadeConstraints', type: STRING),
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropUniqueConstraint", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'uniqueColumns', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropView", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'viewName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "modifyDataType", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnName', type: STRING),
+ parameter(name: 'newDataType', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "renameColumn", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'columnDataType', type: STRING),
+ parameter(name: 'newColumnName', type: STRING),
+ parameter(name: 'oldColumnName', type: STRING),
+ parameter(name: 'remarks', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "renameTable", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'newTableName', type: STRING),
+ parameter(name: 'oldTableName', type: STRING),
+ parameter(name: 'schemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "renameView", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'newViewName', type: STRING),
+ parameter(name: 'oldViewName', type: STRING),
+ parameter(name: 'schemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "addLookupTable", params: [
+ args: [
+ parameter(name: 'constraintName', type: STRING),
+ parameter(name: 'existingColumnName', type: STRING),
+ parameter(name: 'existingTableCatalogName', type: STRING),
+ parameter(name: 'existingTableName', type: STRING),
+ parameter(name: 'existingTableSchemaName', type: STRING),
+ parameter(name: 'newColumnDataType', type: STRING),
+ parameter(name: 'newColumnName', type: STRING),
+ parameter(name: 'newTableCatalogName', type: STRING),
+ parameter(name: 'newTableName', type: STRING),
+ parameter(name: 'newTableSchemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "alterSequence", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'incrementBy', type: STRING),
+ parameter(name: 'maxValue', type: STRING),
+ parameter(name: 'minValue', type: STRING),
+ parameter(name: 'ordered', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'sequenceName', type: STRING),
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "createProcedure", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'comments', type: STRING),
+ parameter(name: 'dbms', type: STRING),
+ parameter(name: 'encoding', type: STRING),
+ parameter(name: 'path', type: STRING),
+ parameter(name: 'procedureName', type: STRING),
+ parameter(name: 'procedureText', type: STRING),
+ parameter(name: 'relativeToChangelogFile', type: STRING),
+ parameter(name: 'schemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "customChange", params: [
+ args: [
+ parameter(name: 'class', type: STRING),
+ ],
+ body: {}
+ ], type: void
+}
+
+provideChildsOf("customChange") {
+ method name: "param", params: [
+ args: [
+ parameter(name: 'id', type: STRING),
+ parameter(name: 'value', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropProcedure", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'procedureName', type: STRING),
+ parameter(name: 'schemaName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "dropSequence", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'sequenceName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "empty", params: [], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "executeCommand", params: [
+ args: [
+ parameter(name: 'executable', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "insert", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'dbms', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("insert", columnType)
+provideChildsOf("insert", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "loadData", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'encoding', type: STRING),
+ parameter(name: 'file', type: STRING),
+ parameter(name: 'quotchar', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'separator', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("loadData", columnType)
+provideChildsOf("loadData", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "loadUpdateData", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'encoding', type: STRING),
+ parameter(name: 'file', type: STRING),
+ parameter(name: 'primaryKey', type: STRING),
+ parameter(name: 'quotchar', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'separator', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("loadUpdateData", columnType)
+provideChildsOf("loadUpdateData", columnTypeNoBody)
+
+provideChildsOf("changeSet") {
+ method name: "mergeColumns", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'column1Name', type: STRING),
+ parameter(name: 'column2Name', type: STRING),
+ parameter(name: 'finalColumnName', type: STRING),
+ parameter(name: 'finalColumnType', type: STRING),
+ parameter(name: 'joinString', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "stop", params: [
+ args: [
+ parameter(name: 'message', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "tagDatabase", params: [
+ args: [
+ parameter(name: 'tag', type: STRING)
+ ]
+ ], type: void
+}
+
+provideChildsOf("changeSet") {
+ method name: "update", params: [
+ args: [
+ parameter(name: 'catalogName', type: STRING),
+ parameter(name: 'schemaName', type: STRING),
+ parameter(name: 'tableName', type: STRING),
+ parameter(name: 'where', type: STRING)
+ ],
+ body: {}
+ ], type: void
+}
+provideChildsOf("update", columnType)
+provideChildsOf("update", columnTypeNoBody)
\ No newline at end of file
diff --git a/grails-data-hibernate5/database-migration/src/main/scripts/dbm-changelog-to-groovy.groovy b/grails-data-hibernate5/database-migration/src/main/scripts/dbm-changelog-to-groovy.groovy
new file mode 100644
index 00000000000..101c8e48e91
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/scripts/dbm-changelog-to-groovy.groovy
@@ -0,0 +1,17 @@
+import org.grails.plugins.databasemigration.DatabaseMigrationException
+import org.grails.plugins.databasemigration.command.DbmChangelogToGroovy
+
+description('Converts a changelog file to a Groovy DSL file') {
+ usage 'grails [environment] dbm-changelog-to-groovy [src_file_name] [dest_file_name]'
+ flag name: 'src_file_name', description: 'The name and path of the changelog file to convert'
+ flag name: 'dest_file_name', description: 'The name and path of the Groovy file'
+ flag name: 'dataSource', description: 'if provided will run the script for the specified dataSource creating a file named changelog-dataSource.groovy if a filename is not given. Not needed for the default dataSource'
+ flag name: 'force', description: 'Whether to overwrite existing files'
+ flag name: 'add', description: 'if provided will run the script for the specified dataSource. Not needed for the default dataSource.'
+}
+
+try {
+ new DbmChangelogToGroovy().handle(executionContext)
+} catch (DatabaseMigrationException e) {
+ error e.message, e
+}
diff --git a/grails-data-hibernate5/database-migration/src/main/scripts/dbm-create-changelog.groovy b/grails-data-hibernate5/database-migration/src/main/scripts/dbm-create-changelog.groovy
new file mode 100644
index 00000000000..252a5b7a986
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/main/scripts/dbm-create-changelog.groovy
@@ -0,0 +1,16 @@
+import org.grails.plugins.databasemigration.DatabaseMigrationException
+import org.grails.plugins.databasemigration.command.DbmCreateChangelog
+
+description('Creates an empty changelog file') {
+ usage 'grails [environment] dbm-create-changelog [filename]'
+ flag name: 'filename', description: 'The path to the output file to write to'
+ flag name: 'dataSource', description: 'if provided will run the script for the specified dataSource creating a file named changelog-dataSource.groovy if a filename is not given. Not needed for the default dataSource'
+ flag name: 'force', description: 'Whether to overwrite existing files'
+ flag name: 'add', description: 'if provided will run the script for the specified dataSource. Not needed for the default dataSource.'
+}
+
+try {
+ new DbmCreateChangelog().handle(executionContext)
+} catch (DatabaseMigrationException e) {
+ error e.message, e
+}
diff --git a/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy b/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy
new file mode 100644
index 00000000000..a1566b495c8
--- /dev/null
+++ b/grails-data-hibernate5/database-migration/src/test/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommandSpec.groovy
@@ -0,0 +1,108 @@
+package org.grails.plugins.databasemigration.command
+
+import grails.config.Config
+import grails.core.DefaultGrailsApplication
+import grails.core.GrailsApplication
+import grails.core.support.GrailsApplicationAware
+import grails.dev.commands.ApplicationCommand
+import grails.dev.commands.ExecutionContext
+import grails.orm.bootstrap.HibernateDatastoreSpringInitializer
+import grails.persistence.Entity
+import grails.util.GrailsNameUtils
+import liquibase.parser.ChangeLogParser
+import liquibase.parser.ChangeLogParserFactory
+import org.grails.build.parsing.CommandLineParser
+import org.grails.config.PropertySourcesConfig
+import org.grails.plugins.databasemigration.liquibase.GroovyChangeLogParser
+import org.h2.Driver
+import org.springframework.context.support.GenericApplicationContext
+import org.springframework.core.env.MapPropertySource
+import org.springframework.core.env.MutablePropertySources
+import spock.lang.AutoCleanup
+
+abstract class ApplicationContextDatabaseMigrationCommandSpec extends DatabaseMigrationCommandSpec implements GrailsApplicationAware {
+
+ GrailsApplication grailsApplication
+
+ @AutoCleanup
+ GenericApplicationContext applicationContext
+
+ ApplicationCommand command
+
+ Config config
+
+ def setup() {
+ applicationContext = new GenericApplicationContext()
+
+ applicationContext.beanFactory.registerSingleton('dataSource', dataSource)
+ applicationContext.beanFactory.registerSingleton(GrailsApplication.APPLICATION_ID, new DefaultGrailsApplication())
+
+ def mutablePropertySources = new MutablePropertySources()
+ mutablePropertySources.addFirst(new MapPropertySource('TestConfig', [
+ 'grails.plugin.databasemigration.changelogLocation': changeLogLocation.canonicalPath,
+ 'dataSource.dbCreate' : '',
+ 'environments.test.dataSource.url' : 'jdbc:h2:mem:testDb',
+ 'dataSource.username' : 'sa',
+ 'dataSource.password' : '',
+ 'dataSource.driverClassName' : Driver.name,
+ 'environments.other.dataSource.url' : 'jdbc:h2:mem:otherDb',
+ ]))
+ config = new PropertySourcesConfig(mutablePropertySources)
+
+ def datastoreInitializer = new HibernateDatastoreSpringInitializer(config, domainClasses)
+ datastoreInitializer.configureForBeanDefinitionRegistry(applicationContext)
+
+ applicationContext.refresh()
+
+ def grailsApplication = applicationContext.getBean(GrailsApplication)
+ grailsApplication.config = config
+
+ def groovyChangeLogParser = ChangeLogParserFactory.instance.parsers.find { ChangeLogParser changeLogParser -> changeLogParser instanceof GroovyChangeLogParser } as GroovyChangeLogParser
+ groovyChangeLogParser.applicationContext = applicationContext
+ groovyChangeLogParser.config = config
+
+ if (commandClass != null) {
+ command = createCommand(commandClass)
+ }
+ }
+
+ protected ApplicationCommand createCommand(Class