libeufin

commit 7cd27e947b9c2670bf7ff2091ed307d36d1c51cc
parent bbe99c48419ee0bf75ee07e95fcc176733dbca68
Author: MS <ms@taler.net>
Date:   Thu, 10 Dec 2020 15:53:43 +0100

db connection string: caller gives all parts

Diffstat:
M
nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
 | 
8
++------
M
nexus/src/test/kotlin/DBTest.kt
 | 
2
+-
M
sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
 | 
8
++------
M
sandbox/src/test/kotlin/DBTest.kt
 | 
9
++-------

4 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/DB.kt
@@ -383,12 +383,8 @@ class NexusScheduledTaskEntity(id: EntityID<Int>) : IntEntity(id) {
     var prevScheduledExecutionSec by NexusScheduledTasksTable.prevScheduledExecutionSec
 }
 
-fun dbCreateTables(dbName: String) {
-    Database.connect(
-        "jdbc:postgresql://127.0.0.1:5433/${dbName}",
-        "org.postgresql.Driver",
-        user = "libeufin"
-    )
+fun dbCreateTables(dbConnectionString: String) {
+    Database.connect("$dbConnectionString")
     TransactionManager.manager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE
     transaction {
         addLogger(StdOutSqlLogger)
diff --git a/nexus/src/test/kotlin/DBTest.kt b/nexus/src/test/kotlin/DBTest.kt
@@ -17,7 +17,7 @@ fun withTestDatabase(f: () -> Unit) {
             it.delete()
         }
     }
-    Database.connect("jdbc:sqlite:$dbfile", "org.sqlite.JDBC")
+    Database.connect("jdbc:sqlite:$dbfile")
     try {
         f()
     }
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/DB.kt
@@ -301,12 +301,8 @@ object BankAccountReportsTable : IntIdTable() {
     val bankAccount = reference("bankAccount", BankAccountsTable)
 }
 
-fun dbCreateTables(dbName: String) {
-    Database.connect(
-        "jdbc:postgresql://127.0.0.1:5433/${dbName}",
-        "org.postgresql.Driver",
-        user = "libeufin"
-    )
+fun dbCreateTables(dbConnectionString: String) {
+    Database.connect("${dbConnectionString}")
     TransactionManager.manager.defaultIsolationLevel = Connection.TRANSACTION_SERIALIZABLE
     transaction {
         addLogger(StdOutSqlLogger)
diff --git a/sandbox/src/test/kotlin/DBTest.kt b/sandbox/src/test/kotlin/DBTest.kt
@@ -19,18 +19,13 @@
 
 import org.jetbrains.exposed.dao.id.EntityID
 import org.jetbrains.exposed.sql.*
-import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.junit.Test
 import tech.libeufin.sandbox.BankAccountTransactionsTable
-import tech.libeufin.sandbox.BankAccountTransactionsTable.msgId
-import tech.libeufin.sandbox.BankAccountTransactionsTable.pmtInfId
 import tech.libeufin.sandbox.BankAccountsTable
 import tech.libeufin.util.millis
 import tech.libeufin.util.parseDashedDate
 import java.io.File
-import java.sql.Connection
-import java.time.Instant
 import java.time.LocalDateTime
 
 /**
@@ -38,13 +33,13 @@ import java.time.LocalDateTime
  * Cleans up the DB file afterwards.
  */
 fun withTestDatabase(f: () -> Unit) {
-    val dbfile = "nexus-test.sqlite3"
+    val dbfile = "jdbc:sqlite:nexus-test.sqlite3"
     File(dbfile).also {
         if (it.exists()) {
             it.delete()
         }
     }
-    Database.connect("jdbc:sqlite:$dbfile", "org.sqlite.JDBC")
+    Database.connect("$dbfile")
     try {
         f()
     }