Merge branch 'op-sqlite-tests' of github.com:powersync-ja/powersync-js into op-sqlite-tests

Author: Chriztiaan

.github/workflows/test-simulators.yaml

@@ -90,26 +90,22 @@ jobs:
           emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: echo "Generated AVD snapshot for caching."
 
+      - name: Android Emulator Build
+        working-directory: ./tools/powersynctests
+        run: pnpx detox build --configuration android.emu.release
+
       - name: Run connected Android tests
         uses: ReactiveCircus/android-emulator-runner@v2.28.0
         with:
           api-level: 31
           target: google_apis
           arch: x86_64
           avd-name: $AVD_NAME
-          script: cd tools/powersynctests && pnpm android
+          script: cd tools/powersynctests && pnpx detox test --configuration android.emu.release --headless
           force-avd-creation: false
           emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
 
-      - name: Android Emulator Build
-        working-directory: ./tools/powersynctests
-        run: pnpx detox build --configuration android.emu.release
-
-      - name: Android Emultator Test
-        working-directory: ./tools/powersynctests
-        run: pnpx detox test --configuration android.emu.release --headless
-
   test-ios:
     name: Test iOS
     runs-on: macOS-15

packages/powersync-op-sqlite/src/db/OPSqliteAdapter.ts

@@ -1,8 +1,8 @@
-import { BaseObserver, DBAdapter, DBAdapterListener, DBLockOptions, QueryResult, Transaction } from '@powersync/common';
 import { ANDROID_DATABASE_PATH, getDylibPath, IOS_LIBRARY_PATH, open, type DB } from '@op-engineering/op-sqlite';
+import { BaseObserver, DBAdapter, DBAdapterListener, DBLockOptions, QueryResult, Transaction } from '@powersync/common';
 import Lock from 'async-lock';
-import { OPSQLiteConnection } from './OPSQLiteConnection';
 import { Platform } from 'react-native';
+import { OPSQLiteConnection } from './OPSQLiteConnection';
 import { SqliteOptions } from './SqliteOptions';
 
 /**
@@ -155,15 +155,14 @@ export class OPSQLiteDBAdapter extends BaseObserver<DBAdapterListener> implement
     }
   }
 
-  close() {
-    this.initialized.then(() => {
-      // Abort any pending operations
-      this.abortController.abort();
-      this.readQueue = [];
+  async close() {
+    await this.initialized;
+    // Abort any pending operations
+    this.abortController.abort();
+    this.readQueue = [];
 
-      this.writeConnection!.close();
-      this.readConnections!.forEach((c) => c.connection.close());
-    });
+    this.writeConnection!.close();
+    this.readConnections!.forEach((c) => c.connection.close());
   }
 
   async readLock<T>(fn: (tx: OPSQLiteConnection) => Promise<T>, options?: DBLockOptions): Promise<T> {

tools/powersynctests/src/tests/queries.test.ts

@@ -585,7 +585,7 @@ export function registerBaseTests() {
       }
 
       await db.executeBatch(statement, bulkInsertCommands);
-      db.close();
+      await db.close();
 
       for (let i = 1; i < 10; i++) {
         db = createDatabase();
@@ -603,7 +603,7 @@ export function registerBaseTests() {
           db.execute(`SELECT * FROM t1 `)
         ];
 
-        db.close();
+        await db.close();
 
         const results = await Promise.allSettled(tests);
         expect(results.map((r) => r.status)).deep.equal(Array(tests.length).fill('rejected'));