admin/Suwayomi-Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow using legacy database connections (#1785)

Browse Source 
* Allow using legacy db connections

* Lint

* Description and docs
This commit is contained in:
Mitchell Syer
2025-11-12 16:24:41 -05:00
committed by GitHub
parent 0a7e6cce87
commit 6c4c2a175b
4 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/main/kotlin/suwayomi/tachidesk/server/ServerSetup.kt
+5 -2
View File
@@ -125,6 +125,7 @@ data class DatabaseSettings(
val databaseUrl: String,
val databaseUsername: String,
val databasePassword: String,
val useHikariConnectionPool: Boolean,
)
val androidCompat by lazy { AndroidCompat() }
@@ -398,17 +399,19 @@ fun applicationSetup() {
serverConfig.databaseUrl,
serverConfig.databaseUsername,
serverConfig.databasePassword,
serverConfig.useHikariConnectionPool,
) { vargs ->
DatabaseSettings(
vargs[0] as DatabaseType,
vargs[1] as String,
vargs[2] as String,
vargs[3] as String,
vargs[4] as Boolean,
)
}.distinctUntilChanged(),
{ (databaseType, databaseUrl, databaseUsername, _) ->
{ (databaseType, databaseUrl, databaseUsername, _, hikariCp) ->
logger.info {
"Database changed - type=$databaseType url=$databaseUrl, username=$databaseUsername, password=[REDACTED]"
"Database changed - type=$databaseType url=$databaseUrl, username=$databaseUsername, password=[REDACTED], hikaricp=$hikariCp"
}
databaseUp()
server/src/main/kotlin/suwayomi/tachidesk/server/database/DBManager.kt
+23 -5
View File
@@ -95,12 +95,30 @@ object DBManager {
preserveKeywordCasing = false
}
// Create a new HikariCP pool
hikariDataSource = createHikariDataSource()
return if (serverConfig.useHikariConnectionPool.value) {
// Create a new HikariCP pool
hikariDataSource = createHikariDataSource()
return Database
.connect(hikariDataSource!!, databaseConfig = dbConfig)
.also { db = it }
return Database
.connect(hikariDataSource!!, databaseConfig = dbConfig)
} else {
when (serverConfig.databaseType.value) {
DatabaseType.POSTGRESQL ->
Database.connect(
"jdbc:${serverConfig.databaseUrl.value}",
"org.postgresql.Driver",
user = serverConfig.databaseUsername.value,
password = serverConfig.databasePassword.value,
databaseConfig = dbConfig,
)
DatabaseType.H2 ->
Database.connect(
"jdbc:h2:${Injekt.get<ApplicationDirs>().dataRoot}/database",
"org.h2.Driver",
databaseConfig = dbConfig,
)
}
}.also { db = it }
}
fun shutdown() {