[db] Final PowerSync fixes

Author: jamesgpearce

src/persisters/persister-powersync/index.ts

@@ -35,8 +35,9 @@ export const createPowerSyncPersister = ((
   configOrStoreTableName?: DatabasePersisterConfig | string,
   onSqlCommand?: (sql: string, params?: any[]) => void,
   onIgnoredError?: (error: any) => void,
-): PowerSyncPersister =>
-  createCustomSqlitePersister(
+): PowerSyncPersister => {
+  let tableListener: DatabaseChangeListener | undefined;
+  return createCustomSqlitePersister(
     store,
     configOrStoreTableName,
     async (sql: string, params: any[] = []): Promise<IdObj<any>[]> =>
@@ -51,20 +52,27 @@ export const createPowerSyncPersister = ((
       });
       (async () => {
         for await (const update of onChange) {
-          arrayMap(update.changedTables, listener);
+          if (tableListener) {
+            arrayMap(update.changedTables, tableListener);
+          }
         }
       })();
+      tableListener = listener;
       return abortController;
     },
-    (abortController: AbortController) => abortController.abort(),
+    (abortController: AbortController) => {
+      tableListener = undefined;
+      abortController.abort();
+    },
     onSqlCommand,
     onIgnoredError,
     () => 0,
     1, // StoreOnly,
     powerSync,
     'getPowerSync',
     viewUpsert,
-  ) as PowerSyncPersister) as typeof createPowerSyncPersisterDecl;
+  ) as PowerSyncPersister;
+}) as typeof createPowerSyncPersisterDecl;
 
 const viewUpsert: Upsert = async (
   executeCommand: DatabaseExecuteCommand,
@@ -89,9 +97,9 @@ const viewUpsert: Upsert = async (
     const unchangingData = objNew(
       arrayMap(
         await executeCommand(
-          'SELECT ' +
+          'SELECT' +
             escapeColumnNames(rowIdColumnName, ...unchangingColumnNames) +
-            ' FROM' +
+            'FROM' +
             escapeId(tableName) +
             'WHERE' +
             escapeId(rowIdColumnName) +

test/unit/persisters/common/databases.ts

@@ -313,7 +313,7 @@ export const SQLITE_NON_MERGEABLE_VARIANTS: Variants = {
       powerSync.execute(sql, args).then((result) => result.rows?._array ?? []),
     (powerSync: AbstractPowerSyncDatabase) => powerSync.close(),
     undefined,
-    undefined,
+    0.01,
     undefined,
     undefined,
     true,

test/unit/persisters/common/mocks.ts

@@ -240,6 +240,7 @@ const getMockedDatabase = <Location>(
   autoLoadIntervalSeconds = 0.001,
   _isPostgres = false,
   _supportsMultipleConnections = false,
+  _skipSqlChecks = false,
 ): Persistable<Location> => {
   const mockDatabase = {
     beforeEach: mockFetchWasm,