Skip to content

Commit 119b9db

Browse files
committed
refactor deprecated api
1 parent fcbc598 commit 119b9db

File tree

1 file changed

+16
-2
lines changed
  • server/src/main/kotlin/suwayomi/tachidesk/server/database

1 file changed

+16
-2
lines changed

server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt

+16-2
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,36 @@ package suwayomi.tachidesk.server.database
99

1010
import de.neonew.exposed.migrations.loadMigrationsFrom
1111
import de.neonew.exposed.migrations.runMigrations
12+
import mu.KotlinLogging
1213
import org.jetbrains.exposed.sql.Database
14+
import org.jetbrains.exposed.sql.DatabaseConfig
1315
import org.kodein.di.DI
1416
import org.kodein.di.conf.global
1517
import org.kodein.di.instance
1618
import suwayomi.tachidesk.server.ApplicationDirs
1719
import suwayomi.tachidesk.server.ServerConfig
1820

1921
object DBManager {
22+
2023
val db by lazy {
2124
val applicationDirs by DI.global.instance<ApplicationDirs>()
22-
Database.connect("jdbc:h2:${applicationDirs.dataRoot}/database", "org.h2.Driver")
25+
Database.connect(
26+
"jdbc:h2:${applicationDirs.dataRoot}/database",
27+
"org.h2.Driver",
28+
databaseConfig = DatabaseConfig {
29+
useNestedTransactions = true
30+
}
31+
)
2332
}
2433
}
2534

35+
private val logger = KotlinLogging.logger {}
36+
2637
fun databaseUp(db: Database = DBManager.db) {
27-
db.useNestedTransactions = true
38+
// call db to initialize the lazy object
39+
logger.info {
40+
"Using ${db.vendor} database version ${db.version}"
41+
}
2842

2943
val migrations = loadMigrationsFrom("suwayomi.tachidesk.server.database.migration", ServerConfig::class.java)
3044
runMigrations(migrations)

0 commit comments

Comments
 (0)