Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

fix grails/gorm-hibernate5#973 for grails-7 (9.0.x) #985

Merged
merged 1 commit into from
Feb 20, 2025
Merged

fix grails/gorm-hibernate5#973 for grails-7 (9.0.x) #985

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ...rails/plugins/databasemigration/command/ApplicationContextDatabaseMigrationCommand.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
Loading