From c764d32d5efcaaa92d04c508b2b5d4d621f89436 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <mike@vorburger.ch>
Date: Sat, 16 May 2020 16:10:01 +0200
Subject: [PATCH] fix Flyway table name problem (FINERACT-979)

---
 .../service/TenantDatabaseUpgradeService.java | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
index a80a6b1ce..e5d461524 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/TenantDatabaseUpgradeService.java
@@ -67,11 +67,13 @@ public class TenantDatabaseUpgradeService {
                 DriverDataSource source = new DriverDataSource(Thread.currentThread().getContextClassLoader(), driverConfig.getDriverClassName(), connectionProtocol, connection.getSchemaUsername(), connection.getSchemaPassword());
 
                 final Flyway flyway = Flyway.configure()
-                    .dataSource(source)
-                    .locations("sql/migrations/core_db")
-                    .outOfOrder(true)
-                    .placeholderReplacement(false)
-                    .load();
+                        .dataSource(source)
+                        .locations("sql/migrations/core_db")
+                        .outOfOrder(true)
+                        .placeholderReplacement(false)
+                        .configuration(Map.of(
+                                "flyway.table", "schema_version")) // FINERACT-979
+                        .load();
 
                 try {
                     flyway.repair();
@@ -97,15 +99,17 @@ public class TenantDatabaseUpgradeService {
         LOG.info("upgradeTenantDB: FINERACT_DEFAULT_TENANTDB_HOSTNAME = {}, FINERACT_DEFAULT_TENANTDB_PORT = {}", dbHostname, dbPort);
 
         final Flyway flyway = Flyway.configure()
-            .dataSource(tenantDataSource)
-            .locations("sql/migrations/list_db")
-            .outOfOrder(true)
-            .placeholders(Map.of( // FINERACT-773
-                "fineract_default_tenantdb_hostname", dbHostname,
-                "fineract_default_tenantdb_port",     dbPort,
-                "fineract_default_tenantdb_uid",      dbUid,
-                "fineract_default_tenantdb_pwd",      dbPwd))
-            .load();
+                .dataSource(tenantDataSource)
+                .locations("sql/migrations/list_db")
+                .outOfOrder(true)
+                .placeholders(Map.of( // FINERACT-773
+                        "fineract_default_tenantdb_hostname", dbHostname,
+                        "fineract_default_tenantdb_port",     dbPort,
+                        "fineract_default_tenantdb_uid",      dbUid,
+                        "fineract_default_tenantdb_pwd",      dbPwd))
+                .configuration(Map.of(
+                        "flyway.table", "schema_version")) // FINERACT-979
+                .load();
 
         flyway.repair();
         flyway.migrate();