修复数据库问题；更新exposed

Author: ForteScarlet

build.gradle.kts

@@ -3,8 +3,6 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    // kotlin("jvm")
-    // id("org.jetbrains.compose")
     alias(libs.plugins.kotlinJvm)
     alias(libs.plugins.jetbrainsCompose)
     // https://conveyor.hydraulic.dev/14.0/configs/maven-gradle/#gradle
@@ -16,7 +14,7 @@ val appName = "StopBonus"
 val appPackage = "love.forte.bonus"
 val appMenuGroup = "forteApp"
 val appNameWithPackage = "$appPackage.$appName"
-val appVersion = "1.0.9"
+val appVersion = "1.0.10"
 
 group = appPackage
 version = appVersion
@@ -52,8 +50,8 @@ dependencies {
     implementation(compose.material)
     implementation(compose.material3)
 
+    implementation(libs.h2db)
     runtimeOnly(libs.logback.classic)
-    runtimeOnly(libs.h2db)
 
     implementation(libs.hikariCP)
     implementation(libs.bundles.exposed)
@@ -107,6 +105,8 @@ compose.desktop {
                 shortcut = true
                 dirChooser = true
                 menuGroup = appMenuGroup
+                perUserInstall = true
+                menu = true
                 iconFile.set(project.rootDir.resolve("icon.ico"))
                 upgradeUuid = "f4a9a22b-b663-4848-95a8-7c0cf844da3f"
             }

gradle/libs.versions.toml

@@ -10,7 +10,7 @@ logback = "1.4.14"
 # https://github.com/h2database/h2database
 h2 = "2.2.224"
 # https://github.com/JetBrains/Exposed
-exposed = "0.48.0"
+exposed = "0.49.0"
 # https://github.com/KoalaPlot/koalaplot-core
 # https://koalaplot.github.io/
 koalaPlot = "0.5.3"

src/main/kotlin/database/DatabaseConnector.kt

@@ -7,19 +7,16 @@ import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.experimental.newSuspendedTransaction
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.transactions.transactionManager
+import org.jetbrains.exposed.sql.vendors.H2Dialect
 import java.nio.file.Path
+import java.util.concurrent.atomic.AtomicBoolean
 import kotlin.coroutines.CoroutineContext
 import kotlin.io.path.Path
 import kotlin.io.path.div
 import kotlin.io.path.pathString
 
-class DatabaseOperator(
-    val schema: Schema,
-    val database: Database,
-    private val dataSource: HikariDataSource,
-) {
+class DatabaseOperator(val database: Database) {
     fun close() {
-        dataSource.close()
     }
 
     suspend inline fun <T> inSuspendedTransaction(
@@ -50,48 +47,42 @@ private const val DATA_FILE_NAME = "bonus.d"
 
 fun connectDatabaseOperator(dataDir: Path = DEFAULT_DATA_DIR, schemaName: String): DatabaseOperator {
     val schema = Schema(schemaName)
+    // val dialect = H2Dialect()
 
-    val jdbcUrl = "jdbc:h2:file:${(dataDir / DATA_FILE_NAME).pathString};" +
+    val jdbcUrl = "jdbc:h2:${(dataDir / DATA_FILE_NAME).pathString};" +
             "DB_CLOSE_DELAY=-1;" +
             "DB_CLOSE_ON_EXIT=FALSE;" +
             "TRACE_LEVEL_FILE=3;" +
             "AUTO_RECONNECT=TRUE;"
 
-    // val database = Database.connect(
-    //     url = jdbcUrl,
-    //     driver = "org.h2.Driver",
-    //     databaseConfig = DatabaseConfig {
-    //         // set other parameters here
-    //         defaultFetchSize = 100
-    //         keepLoadedReferencesOutOfTransaction = true
-    //         defaultMaxRepetitionDelay = 6000
-    //     }
-    // )
+    // val connection
 
     val config = hikariConfig {
         this.jdbcUrl = jdbcUrl
         driverClassName = "org.h2.Driver"
-        poolName = "BonusDBPool"
+        // this.threadFactory
+        connectionInitSql = "CREATE SCHEMA IF NOT EXISTS $schemaName; SET SCHEMA $schemaName"
         minimumIdle = 1
         maximumPoolSize = 1
-
     }
 
-    val dataSource = HikariDataSource(config)
+    val source = HikariDataSource(config)
 
     val database = Database.connect(
-        datasource = dataSource,
+        source,
+        setupConnection = { println("Setup: $it") },
         databaseConfig = DatabaseConfig {
             // set other parameters here
             defaultFetchSize = 100
-            keepLoadedReferencesOutOfTransaction = true
+            //keepLoadedReferencesOutOfTransaction = true
             defaultMaxRepetitionDelay = 6000
         }
     )
 
+
     database.init(schema)
 
-    return DatabaseOperator(schema, database, dataSource)
+    return DatabaseOperator(database)
 }
 
 private inline fun hikariConfig(block: HikariConfig.() -> Unit): HikariConfig = HikariConfig().apply {
@@ -105,6 +96,10 @@ fun Database.init(schema: Schema) {
             SchemaUtils.createSchema(schema)
         }
         SchemaUtils.setSchema(schema)
-        SchemaUtils.createMissingTablesAndColumns(*AllTables)
+        SchemaUtils.createMissingTablesAndColumns(
+            tables = AllTables,
+            inBatch = true,
+            withLogs = true,
+        )
     }
 }