driver modified to use sqldelight 2.0.0

Author: wojta

build.gradle.kts

@@ -1,19 +1,22 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import kotlinx.kover.gradle.plugin.dsl.KoverReportExtension
 import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
 import java.util.*
+import javax.xml.catalog.CatalogFeatures.defaults
 
 plugins {
-    kotlin("multiplatform") version "1.8.20"
+    val kotlinVersion = "1.9.20-Beta"
+    kotlin("multiplatform") version kotlinVersion
     //id("dev.petuska.npm.publish") version "2.1.1"
     id("io.gitlab.arturbosch.detekt").version("1.23.0-RC2")
-    id("org.jetbrains.dokka") version "1.8.10"
-    id("org.jetbrains.kotlinx.kover") version "0.6.1"
+    id("org.jetbrains.dokka") version "1.9.0"
+    id("org.jetbrains.kotlinx.kover") version "0.7.3"
     id("maven-publish")
     id("signing")
 }
 
 val defaultGroupId = "cz.sazel.sqldelight"
-val versionBase = "0.2.0"
+val versionBase = "0.3.0"
 
 val localProperties = Properties().apply {
     try {
@@ -67,8 +70,6 @@ kotlin {
             dependencies {
                 implementation(kotlin("stdlib-common"))
                 implementation(libs.kotlin.coroutines.core)
-
-
             }
         }
         val commonTest by getting {
@@ -85,11 +86,12 @@ kotlin {
             }
         }
         val jsTest by getting {
-            kover {
-                htmlReport {
-                    onCheck.set(true)
+            extensions.configure<KoverReportExtension> {
+                defaults {
+                    html {
+                        onCheck = true
+                    }
                 }
-                isDisabled.set(false)
             }
         }
 
@@ -220,18 +222,11 @@ val bindingsInstall = tasks.register("sqlite3BindingsInstall") {
 }.get()
 tasks["kotlinNpmInstall"].finalizedBy(bindingsInstall)
 
-koverMerged {
-    htmlReport {
-        onCheck.set(true)
-    }
-    enable()
-}
-
 detekt {
     buildUponDefaultConfig = true // preconfigure defaults
     allRules = false // activate all available (even unstable) rules.
     config.setFrom("$projectDir/gradle/detekt/detekt.yml") // point to your custom config defining rules to run, overwriting default behavior
- //   baseline = file("$projectDir/config/baseline.xml") // a way of suppressing issues before introducing detekt
+    //   baseline = file("$projectDir/config/baseline.xml") // a way of suppressing issues before introducing detekt
 }
 
 tasks.withType<Detekt>().configureEach {

gradle/libs.versions.toml

@@ -1,10 +1,10 @@
 [versions]
-kotlin = "1.8.20"
+kotlin = "1.9.20-Beta"
 kotlinCoroutines = "1.6.4"
 schemaCrawler = "16.19.2"
 stately = "1.2.3"
-node-sqlite3 = "5.1.4"
-sqldelight = "2.0.0-rc01"
+node-sqlite3 = "5.1.6"
+sqldelight = "2.0.0"
 
 [libraries]
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

src/jsMain/kotlin/cz/sazel/sqldelight/node/sqlite3/SQLite3Cursor.kt

@@ -52,7 +52,6 @@ internal class SQLite3Cursor(val statementInit: suspend () -> Sqlite3.Statement)
                 if (err == null) cont.resume(Unit) else cont.resumeWithException(SQLite3JsException(err))
             }
             statement.finalize(callback)
-
         }
     }
 

src/jsMain/kotlin/cz/sazel/sqldelight/node/sqlite3/SQLite3Driver.kt

@@ -36,7 +36,7 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
         override fun endTransaction(successful: Boolean): QueryResult<Unit> = QueryResult.AsyncValue {
             if (enclosingTransaction == null) {
                 val sql = if (successful) "END TRANSACTION" else "ROLLBACK TRANSACTION"
-                suspendCoroutine { cont ->
+                suspendCoroutine<Any?> { cont ->
                     val callback: (Any?) -> Unit = {
                         if (it == null || it !is Throwable) {
                             cont.resume(it)
@@ -119,7 +119,7 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
         val transaction = Transaction(enclosing)
         this.transaction = transaction
         if (enclosing == null) {
-            suspendCoroutine { cont ->
+            suspendCoroutine<Any?> { cont ->
                 val callback: (Any?) -> Unit = {
                     if (it == null || it !is Throwable) {
                         cont.resume(it)
@@ -138,20 +138,34 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
 
     internal fun _endTransactionForTests(successful: Boolean) = transaction?._endTransactionForTests(successful)
 
+    internal suspend fun _finalizeAllStatements() {
+        statements.onEach { statement ->
+            suspendCoroutine<Any?> { cont ->
+                val callback: (err: Error?) -> Unit = {
+                    if (it == null) {
+                        cont.resume(it)
+                    } else {
+                        cont.resumeWithException(SQLite3JsException(it))
+                    }
+                }
+                statement.value.finalize(callback)
+            }
+        }
+    }
 
-    override fun addListener(listener: Query.Listener, queryKeys: Array<String>) {
+    override fun addListener(vararg queryKeys: String, listener: Query.Listener) {
         queryKeys.forEach {
             listeners.getOrPut(it) { mutableSetOf() }.add(listener)
         }
     }
 
-    override fun removeListener(listener: Query.Listener, queryKeys: Array<String>) {
+    override fun removeListener(vararg queryKeys: String, listener: Query.Listener) {
         queryKeys.forEach {
             listeners[it]?.remove(listener)
         }
     }
 
-    override fun notifyListeners(queryKeys: Array<String>) {
+    override fun notifyListeners(vararg queryKeys: String) {
         queryKeys.flatMap { listeners[it].orEmpty() }
             .distinct()
             .forEach(Query.Listener::queryResultsChanged)
@@ -170,7 +184,7 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
         if (parameters > 0) {
             val bound = SQLite3PreparedStatement(parameters)
             binders(bound)
-            suspendCoroutine { cont ->
+            suspendCoroutine<Any?> { cont ->
                 val callback: (Any?) -> Unit = {
                     if (it == null || it !is Throwable) {
                         cont.resume(it)

src/jsTest/kotlin/cz/sazel/sqldelight/node/sqlite3/SQLite3DriverTest.kt

@@ -10,7 +10,7 @@ typealias InsertFunction = suspend (SqlPreparedStatement.() -> Unit) -> Unit
 
 class SQLite3DriverTest {
     private val schema = object : SqlSchema<QueryResult.AsyncValue<Unit>> {
-        override val version: Int = 1
+        override val version = 1L
 
         override fun create(driver: SqlDriver): QueryResult.AsyncValue<Unit> = QueryResult.AsyncValue {
             driver.execute(
@@ -40,10 +40,10 @@ class SQLite3DriverTest {
 
         override fun migrate(
             driver: SqlDriver,
-            oldVersion: Int,
-            newVersion: Int,
-            vararg callbacks: AfterVersion,
-        ) = QueryResult.AsyncValue {}
+            oldVersion: Long,
+            newVersion: Long,
+            vararg callbacks: AfterVersion
+        ): QueryResult.AsyncValue<Unit> = QueryResult.AsyncValue {}
     }
 
     private fun runTest(block: suspend (SqlDriver) -> Unit) = kotlinx.coroutines.test.runTest {
@@ -52,6 +52,7 @@ class SQLite3DriverTest {
             val driver = initSqlite3SqlDriver("test.db", schema = schema)
             println("db test.db created")
             block(driver)
+            driver._finalizeAllStatements()
             driver.close()
             println("deleting db")
             js("require('fs').unlinkSync('test.db')")