Merge pull request #985 from zyro23/issue-973

fix #973 for grails-7 (9.0.x)

Author: jdaugherty

grails-database-migration/src/main/groovy/org/grails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy

@@ -35,7 +35,6 @@ import org.hibernate.engine.jdbc.spi.JdbcServices
 import org.hibernate.engine.spi.SessionFactoryImplementor
 import org.springframework.context.ConfigurableApplicationContext
 
-import static org.grails.plugins.databasemigration.DatabaseMigrationGrailsPlugin.getDataSourceName
 import static org.grails.plugins.databasemigration.DatabaseMigrationGrailsPlugin.isDefaultDataSource
 import static org.grails.plugins.databasemigration.PluginConstants.DEFAULT_DATASOURCE_NAME
 
@@ -78,18 +77,17 @@ trait ApplicationContextDatabaseMigrationCommand implements DatabaseMigrationCom
     }
 
     private Database createGormDatabase(ConfigurableApplicationContext applicationContext, String dataSource) {
-        String dataSourceName = getDataSourceName(dataSource)
         String sessionFactoryName = "sessionFactory"
         if (!isDefaultDataSource(dataSource)) {
-            sessionFactoryName = sessionFactoryName + '_' + dataSourceName
+            sessionFactoryName = sessionFactoryName + '_' + dataSource
         }
 
         def serviceRegistry = applicationContext.getBean(sessionFactoryName, SessionFactoryImplementor).serviceRegistry.parentServiceRegistry
 
         Dialect dialect = serviceRegistry.getService(JdbcServices.class).dialect
 
         HibernateDatastore hibernateDatastore = applicationContext.getBean("hibernateDatastore", HibernateDatastore)
-        hibernateDatastore = hibernateDatastore.getDatastoreForConnection(dataSourceName)
+        hibernateDatastore = hibernateDatastore.getDatastoreForConnection(dataSource)
 
         Database database = new GormDatabase(dialect, serviceRegistry, hibernateDatastore)
         configureDatabase(database)