Cleanup logic for dropping the destination table, ordering by operation_id. Using createDestination table helper.

Author: Chriztiaan

packages/powersync-db-collection/package.json

@@ -62,8 +62,8 @@
     "@powersync/common": "^1.41.0"
   },
   "devDependencies": {
-    "@powersync/common": "0.0.0-dev-20260305124002",
-    "@powersync/node": "0.0.0-dev-20260305124002",
+    "@powersync/common": "0.0.0-dev-20260306125455",
+    "@powersync/node": "0.0.0-dev-20260306125455",
     "@types/debug": "^4.1.12",
     "@vitest/coverage-istanbul": "^3.2.4"
   }

packages/powersync-db-collection/src/powersync.ts

@@ -370,7 +370,7 @@ export function powerSyncCollectionOptions<
           .writeTransaction(async (context) => {
             begin()
             const operations = await context.getAll<TriggerDiffRecord>(
-              `SELECT * FROM ${trackedTableName} ORDER BY timestamp ASC`,
+              `SELECT * FROM ${trackedTableName} ORDER BY operation_id ASC`,
             )
             const pendingOperations: Array<PendingOperation> = []
 
@@ -440,8 +440,22 @@ export function powerSyncCollectionOptions<
         } else {
           abortController.signal.addEventListener(
             `abort`,
-            () => {
-              disposeTracking?.()
+            async () => {
+              await disposeTracking?.()
+
+              // In on-demand mode, we need to manually drop the destination table because we opt-out of internal management of the destination table.
+              if (syncMode === 'on-demand') {
+                try {
+                  await database.execute(
+                    `DROP TABLE IF EXISTS ${trackedTableName};`,
+                  )
+                } catch (error) {
+                  database.logger.error(
+                    `Could not drop tracked table ${trackedTableName}`,
+                    error,
+                  )
+                }
+              }
             },
             { once: true },
           )
@@ -513,17 +527,9 @@ export function powerSyncCollectionOptions<
             return
           }
 
-          await database.writeLock(async (context) => {
-            await context.execute(`
-              CREATE TEMP TABLE IF NOT EXISTS ${trackedTableName} (
-                operation_id INTEGER PRIMARY KEY AUTOINCREMENT,
-                id TEXT,
-                operation TEXT,
-                timestamp TEXT,
-                value TEXT,
-                previous_value TEXT
-              )
-            `)
+          await database.triggers.createDiffDestinationTable(trackedTableName, {
+            temporary: true,
+            onlyIfNotExists: true,
           })
 
           const combinedWhere =

packages/powersync-db-collection/tests/on-demand-sync.test.ts

@@ -33,10 +33,11 @@ describe(`On-Demand Sync Mode`, () => {
       schema: APP_SCHEMA,
     })
     onTestFinished(async () => {
+      await db.disconnectAndClear()
+
       // Wait a moment for any pending cleanup operations to complete
       // before closing the database to prevent "operation on closed remote" errors
       await new Promise((resolve) => setTimeout(resolve, 100))
-      await db.disconnectAndClear()
       await db.close()
     })
     await db.disconnectAndClear()