diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2023-11-30 15:18:29 +0900 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2023-11-30 15:18:29 +0900 |
commit | 9ee3c46e856c21998b4643a58622daa06da84ee8 (patch) | |
tree | 425a71f1cae359c5862cdc6b19c191019c54e734 /util/src/main/kotlin/DB.kt | |
parent | 99b5c6c428026af8ac8c5fbf17e3cbc10d677a6f (diff) | |
download | libeufin-9ee3c46e856c21998b4643a58622daa06da84ee8.tar.gz libeufin-9ee3c46e856c21998b4643a58622daa06da84ee8.tar.bz2 libeufin-9ee3c46e856c21998b4643a58622daa06da84ee8.zip |
-minor fixes
Diffstat (limited to 'util/src/main/kotlin/DB.kt')
-rw-r--r-- | util/src/main/kotlin/DB.kt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/src/main/kotlin/DB.kt b/util/src/main/kotlin/DB.kt index 53e81fff..830832b6 100644 --- a/util/src/main/kotlin/DB.kt +++ b/util/src/main/kotlin/DB.kt @@ -196,9 +196,11 @@ fun initializeDatabaseTables(cfg: DatabaseConfig, sqlFilePrefix: String) { logger.info("doing DB initialization, sqldir ${cfg.sqlDir}, dbConnStr ${cfg.dbConnStr}") pgDataSource(cfg.dbConnStr).pgConnection().use { conn -> conn.transaction { + // FIXME: evil hack, we should instead simply first check if _v exists! val sqlVersioning = File("${cfg.sqlDir}/versioning.sql").readText() - conn.execSQLUpdate(sqlVersioning) - + try { + conn.execSQLUpdate(sqlVersioning) + } catch (e: SQLException) {} val checkStmt = conn.prepareStatement("SELECT count(*) as n FROM _v.patches where patch_name = ?") for (n in 1..9999) { |