Correct datasource configuration #141

grails · Aug 17, 2018 · a3d1a78 · a3d1a78
1 parent 8dd2524
commit a3d1a78
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/docs/asciidoc/configuration.adoc b/src/docs/asciidoc/configuration.adoc
@@ -32,9 +32,9 @@ NOTE: All of the above configs can be used for a multiple datasources
 If a reports dataSource is configured in application.yml
 [source,groovy]
 ----
-dataSources:
-    dataSource:
+dataSource:
         ...
+dataSources:
     reports:
         url: ...
         driverClassName: ...

diff --git a/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy b/src/main/groovy/org/grails/plugins/databasemigration/command/DatabaseMigrationCommand.groovy
@@ -105,6 +105,11 @@ trait DatabaseMigrationCommand {
 
     Map<String, String> getDataSourceConfig(ConfigMap config = this.config) {
         def dataSourceName = dataSource ?: 'dataSource'
+
+        if (dataSourceName == 'dataSource') {
+            return (Map<String, String>)(config.getProperty(dataSourceName, Map) ?: [:])
+        }
+
         def dataSources = config.getProperty('dataSources', Map) ?: [:]
         if (!dataSources) {
             def defaultDataSource = config.getProperty('dataSource', Map)