Merge pull request #966 from grails/issue965

Remove "dataSource_" from bean name as dataSourceName of GroovyChange when using additional dataSources

Author: jdaugherty

grails-database-migration/src/main/groovy/org/grails/plugins/databasemigration/liquibase/GroovyChange.groovy

@@ -90,6 +90,9 @@ class GroovyChange extends AbstractChange {
     void load(ParsedNode parsedNode, ResourceAccessor resourceAccessor) throws ParsedNodeException {
         ctx = parsedNode.getChildValue(null, 'applicationContext', ApplicationContext)
         dataSourceName = parsedNode.getChildValue(null, DATA_SOURCE_NAME_KEY, String)
+        if (dataSourceName?.startsWith("dataSource_")) {
+            dataSourceName = dataSourceName.substring("dataSource_".length())
+        }
 
         initClosure = parsedNode.getChildValue(null, 'init', Closure)
         initClosure?.setResolveStrategy(Closure.DELEGATE_FIRST)