Fixing statement finalization

Author: wojta

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

@@ -24,7 +24,11 @@ internal class SQLite3Cursor(val statementInit: suspend () -> Sqlite3.Statement)
             reset()
             initialized = true
         }
-        row = fetchRow() ?: return@AsyncValue false
+        row = fetchRow()
+        if (row == null) {
+            _close()
+            return@AsyncValue false
+        }
         counter++
         true
     }
@@ -47,12 +51,7 @@ internal class SQLite3Cursor(val statementInit: suspend () -> Sqlite3.Statement)
 
     @Suppress("FunctionNaming")
     internal suspend fun _close() {
-        suspendCoroutine { cont ->
-            val callback: (Error?) -> Unit = { err ->
-                if (err == null) cont.resume(Unit) else cont.resumeWithException(SQLite3JsException(err))
-            }
-            statement.finalize(callback)
-        }
+        statement.finalizeSuspending()
     }
 
     private suspend fun reset() {
@@ -61,7 +60,6 @@ internal class SQLite3Cursor(val statementInit: suspend () -> Sqlite3.Statement)
                 cont.resume(Unit)
             }
             statement.reset(callback)
-
         }
     }
 

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

@@ -25,16 +25,30 @@ private fun initSqlite3Database(
 internal suspend fun SQLite3Driver.withSchema(schema: SqlSchema<QueryResult.AsyncValue<Unit>>? = null) =
     this.also { schema?.create(it)?.await() }
 
+internal suspend fun (Sqlite3.Statement).finalizeSuspending() {
+    suspendCoroutine<Any?> { cont ->
+        val callback: (err: Error?) -> Unit = {
+            if (it == null) {
+                cont.resume(it)
+            } else {
+                cont.resumeWithException(SQLite3JsException(it))
+            }
+        }
+        finalize(callback)
+    }
+}
+
 class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : SqlDriver {
     private val listeners = mutableMapOf<String, MutableSet<Query.Listener>>()
-    private val statements = mutableMapOf<Int, Sqlite3.Statement>()
     private var transaction: Transaction? = null
 
     internal inner class Transaction(
         override val enclosingTransaction: Transacter.Transaction?,
     ) : Transacter.Transaction() {
+        internal val statements = mutableMapOf<Int, Sqlite3.Statement>()
         override fun endTransaction(successful: Boolean): QueryResult<Unit> = QueryResult.AsyncValue {
             if (enclosingTransaction == null) {
+                statements.onEach { it.value.finalizeSuspending() }
                 val sql = if (successful) "END TRANSACTION" else "ROLLBACK TRANSACTION"
                 suspendCoroutine<Any?> { cont ->
                     val callback: (Any?) -> Unit = {
@@ -73,9 +87,9 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
         val res = if (identifier == null) {
             preparedStatement
         } else {
-            statements.getOrPut(identifier) {
+            transaction?.statements?.getOrPut(identifier) {
                 return@getOrPut preparedStatement
-            }
+            } ?: preparedStatement
         }
         return res
     }
@@ -96,6 +110,9 @@ class SQLite3Driver internal constructor(private val db: Sqlite3.Database) : Sql
             }
             statement.run(callback)
         }
+        if (transaction == null) {
+            statement.finalizeSuspending()
+        }
         return@AsyncValue 0
     }
 
@@ -138,21 +155,6 @@ 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(vararg queryKeys: String, listener: Query.Listener) {
         queryKeys.forEach {
             listeners.getOrPut(it) { mutableSetOf() }.add(listener)

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

@@ -52,7 +52,6 @@ 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')")