CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

fix Flyway table name problem (FINERACT-979)

Browse Source
This commit is contained in:
Michael Vorburger
2020-05-16 18:34:19 +02:00
committed by Michael Vorburger ⛑️
parent 20e8a02294
commit c764d32d5e
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+18 -14
View File
@@ -67,11 +67,13 @@ public class TenantDatabaseUpgradeService {
DriverDataSource source = new DriverDataSource(Thread.currentThread().getContextClassLoader(), driverConfig.getDriverClassName(), connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword()); DriverDataSource source = new DriverDataSource(Thread.currentThread().getContextClassLoader(), driverConfig.getDriverClassName(), connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword());
final Flyway flyway = Flyway.configure() final Flyway flyway = Flyway.configure()
.dataSource(source) .dataSource(source)
.locations("sql/migrations/core_db") .locations("sql/migrations/core_db")
.outOfOrder(true) .outOfOrder(true)
.placeholderReplacement(false) .placeholderReplacement(false)
.load(); .configuration(Map.of(
"flyway.table", "schema_version")) // FINERACT-979
.load();
try { try {
flyway.repair(); flyway.repair();
@@ -97,15 +99,17 @@ public class TenantDatabaseUpgradeService {
LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort); LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort);
final Flyway flyway = Flyway.configure() final Flyway flyway = Flyway.configure()
.dataSource(tenantDataSource) .dataSource(tenantDataSource)
.locations("sql/migrations/list_db") .locations("sql/migrations/list_db")
.outOfOrder(true) .outOfOrder(true)
.placeholders(Map.of( // FINERACT-773 .placeholders(Map.of( // FINERACT-773
"fineract_default_tenantdb_hostname", dbHostname, "fineract_default_tenantdb_hostname", dbHostname,
"fineract_default_tenantdb_port", dbPort, "fineract_default_tenantdb_port", dbPort,
"fineract_default_tenantdb_uid", dbUid, "fineract_default_tenantdb_uid", dbUid,
"fineract_default_tenantdb_pwd", dbPwd)) "fineract_default_tenantdb_pwd", dbPwd))
.load(); .configuration(Map.of(
"flyway.table", "schema_version")) // FINERACT-979
.load();
flyway.repair(); flyway.repair();
flyway.migrate(); flyway.migrate();