From a3d1a78224e65b6fb68c16b939061208358523bd Mon Sep 17 00:00:00 2001 From: Puneet Behl Date: Fri, 17 Aug 2018 16:43:01 +0530 Subject: [PATCH] Correct datasource configuration #141 --- src/docs/asciidoc/configuration.adoc | 4 ++-- .../command/DatabaseMigrationCommand.groovy | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/configuration.adoc b/src/docs/asciidoc/configuration.adoc index 841d5877..7f5a28f0 100644 --- 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 index b5d48666..dda681c6 100644 --- 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 getDataSourceConfig(ConfigMap config = this.config) { def dataSourceName = dataSource ?: 'dataSource' + + if (dataSourceName == 'dataSource') { + return (Map)(config.getProperty(dataSourceName, Map) ?: [:]) + } + def dataSources = config.getProperty('dataSources', Map) ?: [:] if (!dataSources) { def defaultDataSource = config.getProperty('dataSource', Map)