Merge branch 'main' into fix-download-race-condition

Author: simolus3

CHANGELOG.md

@@ -3,6 +3,11 @@
 ## 1.0.0-BETA29 (unreleased)
 
 * Fix potential race condition between jobs in `connect()` and `disconnect()`.
+* [JVM Windows] Fixed PowerSync Extension temporary file deletion error on process shutdown.
+* [iOS] Fixed issue where automatic driver migrations would fail with the error:
+```
+Sqlite operation failure database is locked attempted to run migration and failed. closing connection
+```
 * Fix race condition causing data received during uploads not to be applied.
 
 ## 1.0.0-BETA28

core/build.gradle.kts

@@ -261,6 +261,7 @@ kotlin {
             implementation(libs.kotlin.test)
             implementation(libs.test.coroutines)
             implementation(libs.test.turbine)
+            implementation(libs.test.kotest.assertions)
             implementation(libs.kermit.test)
             implementation(libs.ktor.client.mock)
             implementation(libs.test.turbine)

core/src/commonIntegrationTest/kotlin/com/powersync/DatabaseTest.kt

@@ -2,110 +2,59 @@ package com.powersync
 
 import app.cash.turbine.turbineScope
 import co.touchlab.kermit.ExperimentalKermitApi
-import co.touchlab.kermit.Logger
-import co.touchlab.kermit.Severity
-import co.touchlab.kermit.TestConfig
-import co.touchlab.kermit.TestLogWriter
 import com.powersync.db.ActiveDatabaseGroup
-import com.powersync.db.getString
 import com.powersync.db.schema.Schema
 import com.powersync.testutils.UserRow
-import com.powersync.testutils.generatePrintLogWriter
+import com.powersync.testutils.databaseTest
 import com.powersync.testutils.getTempDir
 import com.powersync.testutils.waitFor
+import io.kotest.assertions.throwables.shouldThrow
+import io.kotest.matchers.collections.shouldHaveSize
+import io.kotest.matchers.shouldBe
+import io.kotest.matchers.string.shouldContain
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.withContext
-import kotlin.test.AfterTest
-import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFailsWith
 import kotlin.test.assertNotNull
-import kotlin.test.assertTrue
 
 @OptIn(ExperimentalKermitApi::class)
 class DatabaseTest {
-    private val logWriter =
-        TestLogWriter(
-            loggable = Severity.Debug,
-        )
-
-    private val logger =
-        Logger(
-            TestConfig(
-                minSeverity = Severity.Debug,
-                logWriterList = listOf(logWriter, generatePrintLogWriter()),
-            ),
-        )
-
-    private lateinit var database: PowerSyncDatabase
-
-    private fun openDB() =
-        PowerSyncDatabase(
-            factory = com.powersync.testutils.factory,
-            schema = Schema(UserRow.table),
-            dbFilename = "testdb",
-            logger = logger,
-        )
-
-    @BeforeTest
-    fun setupDatabase() {
-        logWriter.reset()
-
-        database = openDB()
-
-        runBlocking {
-            database.disconnectAndClear(true)
-        }
-    }
-
-    @AfterTest
-    fun tearDown() {
-        runBlocking {
-            if (!database.closed) {
-                database.disconnectAndClear(true)
-                database.close()
-            }
-        }
-        com.powersync.testutils.cleanup("testdb")
-    }
-
     @Test
     fun testLinksPowerSync() =
-        runTest {
+        databaseTest {
             database.get("SELECT powersync_rs_version();") { it.getString(0)!! }
         }
 
     @Test
     fun testWAL() =
-        runTest {
+        databaseTest {
             val mode =
                 database.get(
                     "PRAGMA journal_mode",
                     mapper = { it.getString(0)!! },
                 )
-            assertEquals(mode, "wal")
+            mode shouldBe "wal"
         }
 
     @Test
     fun testFTS() =
-        runTest {
+        databaseTest {
             val mode =
                 database.get(
                     "SELECT sqlite_compileoption_used('ENABLE_FTS5');",
                     mapper = { it.getLong(0)!! },
                 )
-            assertEquals(mode, 1)
+            mode shouldBe 1
         }
 
     @Test
     fun testConcurrentReads() =
-        runTest {
+        databaseTest {
             database.execute(
                 "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
                 listOf(
@@ -118,7 +67,7 @@ class DatabaseTest {
             val transactionItemCreated = CompletableDeferred<Unit>()
             // Start a long running writeTransaction
             val transactionJob =
-                async {
+                scope.async {
                     database.writeTransaction { tx ->
                         // Create another user
                         // External readers should not see this user while the transaction is open
@@ -156,7 +105,7 @@ class DatabaseTest {
 
     @Test
     fun testTransactionReads() =
-        runTest {
+        databaseTest {
             database.execute(
                 "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
                 listOf(
@@ -187,18 +136,18 @@ class DatabaseTest {
 
     @Test
     fun testTableUpdates() =
-        runTest {
+        databaseTest {
             turbineScope {
                 val query = database.watch("SELECT * FROM users") { UserRow.from(it) }.testIn(this)
 
                 // Wait for initial query
-                assertEquals(0, query.awaitItem().size)
+                query.awaitItem() shouldHaveSize 0
 
                 database.execute(
                     "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
                     listOf("Test", "test@example.org"),
                 )
-                assertEquals(1, query.awaitItem().size)
+                query.awaitItem() shouldHaveSize 1
 
                 database.writeTransaction {
                     it.execute(
@@ -211,7 +160,7 @@ class DatabaseTest {
                     )
                 }
 
-                assertEquals(3, query.awaitItem().size)
+                query.awaitItem() shouldHaveSize 3
 
                 try {
                     database.writeTransaction {
@@ -226,7 +175,7 @@ class DatabaseTest {
                     "INSERT INTO users (id, name, email) VALUES (uuid(), ?, ?)",
                     listOf("Test4", "test4@example.org"),
                 )
-                assertEquals(4, query.awaitItem().size)
+                query.awaitItem() shouldHaveSize 4
 
                 query.expectNoEvents()
                 query.cancel()
@@ -235,12 +184,12 @@ class DatabaseTest {
 
     @Test
     fun testClosingReadPool() =
-        runTest {
+        databaseTest {
             val pausedLock = CompletableDeferred<Unit>()
             val inLock = CompletableDeferred<Unit>()
             // Request a lock
             val lockJob =
-                async {
+                scope.async {
                     database.readLock {
                         inLock.complete(Unit)
                         runBlocking {
@@ -255,60 +204,48 @@ class DatabaseTest {
             // Close the database. This should close the read pool
             // The pool should wait for jobs to complete before closing
             val closeJob =
-                async {
+                scope.async {
                     database.close()
                 }
 
             // Wait a little for testing
-            // Spawns in a different context for the delay to actually take affect
-            async { withContext(Dispatchers.Default) { delay(500) } }.await()
+            // Spawns in a different context for the delay to actually take effect
+            scope.async { withContext(Dispatchers.Default) { delay(500) } }.await()
 
             // The database should not close yet
             assertEquals(actual = database.closed, expected = false)
 
             // Any new readLocks should throw
-            val exception = assertFailsWith<PowerSyncException> { database.readLock {} }
-            assertEquals(
-                expected = "Cannot process connection pool request",
-                actual = exception.message,
-            )
+            val exception = shouldThrow<PowerSyncException> { database.readLock {} }
+            exception.message shouldBe "Cannot process connection pool request"
+
             // Release the lock
             pausedLock.complete(Unit)
             lockJob.await()
             closeJob.await()
 
-            assertEquals(actual = database.closed, expected = true)
+            database.closed shouldBe true
         }
 
     @Test
     fun openDBWithDirectory() =
-        runTest {
+        databaseTest {
             val tempDir =
                 getTempDir()
                     ?: // SQLiteR, which is used on iOS, does not support opening dbs from directories
-                    return@runTest
-
-            val dbFilename = "testdb"
+                    return@databaseTest
 
-            val db =
-                PowerSyncDatabase(
-                    factory = com.powersync.testutils.factory,
-                    schema = Schema(UserRow.table),
-                    dbFilename = dbFilename,
-                    dbDirectory = getTempDir(),
-                    logger = logger,
-                )
-
-            val path = db.get("SELECT file FROM pragma_database_list;") { it.getString(0)!! }
-            assertTrue { path.contains(tempDir) }
-            db.close()
+            // On platforms that support it, openDatabase() from our test utils should use a temporary
+            // location.
+            val path = database.get("SELECT file FROM pragma_database_list;") { it.getString(0)!! }
+            path shouldContain tempDir
         }
 
     @Test
     fun warnsMultipleInstances() =
-        runTest {
+        databaseTest {
             // Opens a second DB with the same database filename
-            val db2 = openDB()
+            val db2 = openDatabase()
             waitFor {
                 assertNotNull(
                     logWriter.logs.find {
@@ -321,9 +258,9 @@ class DatabaseTest {
 
     @Test
     fun readConnectionsReadOnly() =
-        runTest {
+        databaseTest {
             val exception =
-                assertFailsWith<PowerSyncException> {
+                shouldThrow<PowerSyncException> {
                     database.getOptional(
                         """
                         INSERT INTO 
@@ -335,23 +272,24 @@ class DatabaseTest {
                         parameters = listOf("steven", "steven@journeyapps.com"),
                     ) {}
                 }
+
             // The exception messages differ slightly between drivers
-            assertTrue { exception.message!!.contains("write a readonly database") }
+            exception.message shouldContain "write a readonly database"
         }
 
     @Test
     fun basicReadTransaction() =
-        runTest {
+        databaseTest {
             val count =
                 database.readTransaction { it ->
                     it.get("SELECT COUNT(*) from users") { it.getLong(0)!! }
                 }
-            assertEquals(expected = 0, actual = count)
+            count shouldBe 0
         }
 
     @Test
     fun localOnlyCRUD() =
-        runTest {
+        databaseTest {
             database.updateSchema(
                 schema =
                     Schema(
@@ -375,16 +313,16 @@ class DatabaseTest {
             )
 
             val count = database.get("SELECT COUNT(*) FROM local_users") { it.getLong(0)!! }
-            assertEquals(actual = count, expected = 1)
+            count shouldBe 1
 
             // No CRUD entries should be present for local only tables
             val crudItems = database.getAll("SELECT id from ps_crud") { it.getLong(0)!! }
-            assertEquals(actual = crudItems.size, expected = 0)
+            crudItems shouldHaveSize 0
         }
 
     @Test
     fun insertOnlyCRUD() =
-        runTest {
+        databaseTest {
             database.updateSchema(schema = Schema(UserRow.table.copy(insertOnly = true)))
 
             database.execute(
@@ -397,15 +335,15 @@ class DatabaseTest {
             )
 
             val crudItems = database.getAll("SELECT id from ps_crud") { it.getLong(0)!! }
-            assertEquals(actual = crudItems.size, expected = 1)
+            crudItems shouldHaveSize 1
 
             val count = database.get("SELECT COUNT(*) from users") { it.getLong(0)!! }
-            assertEquals(actual = count, expected = 0)
+            count shouldBe 0
         }
 
     @Test
     fun viewOverride() =
-        runTest {
+        databaseTest {
             database.updateSchema(schema = Schema(UserRow.table.copy(viewNameOverride = "people")))
 
             database.execute(
@@ -418,9 +356,9 @@ class DatabaseTest {
             )
 
             val crudItems = database.getAll("SELECT id from ps_crud") { it.getLong(0)!! }
-            assertEquals(actual = crudItems.size, expected = 1)
+            crudItems shouldHaveSize 1
 
             val count = database.get("SELECT COUNT(*) from people") { it.getLong(0)!! }
-            assertEquals(actual = count, expected = 1)
+            count shouldBe 1
         }
 }