Check applied migration

5 files changed, 7 insertions, 12 deletions

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DbInit.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DbInit.kt
index 7120faf2..0128ab85 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/DbInit.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/DbInit.kt
@@ -32,18 +32,13 @@ import tech.libeufin.common.db.*
  */
 class DbInit : CliktCommand("Initialize the libeufin-nexus database", name = "dbinit") {
     private val common by CommonOption()
-    private val requestReset by option(
+    private val reset by option(
         "--reset", "-r",
         help = "Reset database (DANGEROUS: All existing data is lost)"
     ).flag()
 
     override fun run() = cliCmd(logger, common.log) {
         val cfg = loadConfig(common.config).dbConfig()
-        pgDataSource(cfg.dbConnStr).pgConnection().use { conn ->
-            if (requestReset) {
-                resetDatabaseTables(conn, cfg, sqlFilePrefix = "libeufin-nexus")
-            }
-            initializeDatabaseTables(conn, cfg, sqlFilePrefix = "libeufin-nexus")
-        }
+        pgDataSource(cfg.dbConnStr).dbInit(cfg, "libeufin-nexus", reset)
     }
 }
\ No newline at end of file
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
index fd6be2d9..9e95a52c 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsFetch.kt
@@ -366,7 +366,7 @@ class EbicsFetch: CliktCommand("Fetches EBICS files") {
         val cfg = extractEbicsConfig(common.config)
         val dbCfg = cfg.config.dbConfig()
 
-        Database(dbCfg.dbConnStr).use { db ->
+        Database(dbCfg).use { db ->
             val (clientKeys, bankKeys) = expectFullKeys(cfg)
             val ctx = FetchContext(
                 cfg,
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
index 34d57969..12a72d40 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/EbicsSubmit.kt
@@ -156,7 +156,7 @@ class EbicsSubmit : CliktCommand("Submits any initiated payment found in the dat
             httpClient = HttpClient(),
             fileLogger = FileLogger(ebicsLog)
         )
-        Database(dbCfg.dbConnStr).use { db -> 
+        Database(dbCfg).use { db -> 
             val frequency: Duration = if (transient) {
                 logger.info("Transient mode: submitting what found and returning.")
                 Duration.ZERO
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 496a13cf..7e7a5e5d 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -161,7 +161,7 @@ class InitiatePayment: CliktCommand("Initiate an outgoing payment") {
             Base32Crockford.encode(bytes)
         }
 
-        Database(dbCfg.dbConnStr).use { db ->
+        Database(dbCfg).use { db ->
             db.initiated.create(
                 InitiatedPayment(
                     id = -1,
@@ -207,7 +207,7 @@ class FakeIncoming: CliktCommand("Genere a fake incoming payment") {
             Base32Crockford.encode(bytes)
         }
 
-        Database(dbCfg.dbConnStr).use { db ->
+        Database(dbCfg).use { db ->
             ingestIncomingPayment(db, 
                 IncomingPayment(
                     amount = amount,
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/db/Database.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/db/Database.kt
index 069185a9..d76a0405 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/db/Database.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/db/Database.kt
@@ -44,7 +44,7 @@ data class InitiatedPayment(
 /**
  * Collects database connection steps and any operation on the Nexus tables.
  */
-class Database(dbConfig: String): DbPool(dbConfig, "libeufin_nexus") {
+class Database(dbConfig: DatabaseConfig): DbPool(dbConfig, "libeufin_nexus") {
     val payment = PaymentDAO(this)
     val initiated = InitiatedDAO(this)
 }
\ No newline at end of file