@powersync/service-module-postgres 0.0.0-dev-20260203155513 → 0.0.0-dev-20260223080959

package/test/src/schema_changes.test.ts

@@ -2,8 +2,7 @@ import { compareIds, putOp, reduceBucket, removeOp, test_utils } from '@powersyn
 import * as timers from 'timers/promises';
 import { describe, expect, test } from 'vitest';
 
-import { storage } from '@powersync/service-core';
-import { describeWithStorage } from './util.js';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 import { WalStreamTestContext } from './wal_stream_utils.js';
 
 describe('schema changes', { timeout: 20_000 }, function () {
@@ -24,9 +23,12 @@ const PUT_T3 = test_utils.putOp('test_data', { id: 't3', description: 'test3' })
 const REMOVE_T1 = test_utils.removeOp('test_data', 't1');
 const REMOVE_T2 = test_utils.removeOp('test_data', 't2');
 
-function defineTests(factory: storage.TestStorageFactory) {
+function defineTests({ factory, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof WalStreamTestContext.open>[1]) => {
+    return WalStreamTestContext.open(factory, { ...options, storageVersion });
+  };
   test('re-create table', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
 
     // Drop a table and re-create it.
     await context.updateSyncRules(BASIC_SYNC_RULES);
@@ -49,6 +51,11 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
 
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T3]);
+
     // Initial inserts
     expect(data.slice(0, 2)).toMatchObject([PUT_T1, PUT_T2]);
 
@@ -65,7 +72,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('add table', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Add table after initial replication
     await context.updateSyncRules(BASIC_SYNC_RULES);
     const { pool } = context;
@@ -78,6 +85,11 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
 
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1]);
+
     expect(data).toMatchObject([
       // Snapshot insert
       PUT_T1,
@@ -88,7 +100,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('rename table (1)', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
 
     await context.updateSyncRules(BASIC_SYNC_RULES);
@@ -108,6 +120,11 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
 
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2]);
+
     expect(data.slice(0, 2).sort(compareIds)).toMatchObject([
       // Snapshot insert
       PUT_T1,
@@ -121,7 +138,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('rename table (2)', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Rename table in sync rules -> in sync rules
     const { pool } = context;
 
@@ -146,6 +163,14 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
 
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([
+      putOp('test_data2', { id: 't1', description: 'test1' }),
+      putOp('test_data2', { id: 't2', description: 'test2' })
+    ]);
+
     expect(data.slice(0, 2)).toMatchObject([
       // Initial replication
       putOp('test_data1', { id: 't1', description: 'test1' }),
@@ -166,7 +191,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('rename table (3)', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Rename table in sync rules -> not in sync rules
 
     const { pool } = context;
@@ -193,10 +218,15 @@ function defineTests(factory: storage.TestStorageFactory) {
       // Truncate
       REMOVE_T1
     ]);
+
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([]);
   });
 
   test('change replica id', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Change replica id from default to full
     // Causes a re-import of the table.
 
@@ -217,6 +247,11 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
 
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2]);
+
     expect(data.slice(0, 2)).toMatchObject([
       // Initial inserts
       PUT_T1,
@@ -235,7 +270,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('change full replica id by adding column', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Change replica id from full by adding column
     // Causes a re-import of the table.
     // Other changes such as renaming column would have the same effect
@@ -278,7 +313,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('change default replica id by changing column type', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Change default replica id by changing column type
     // Causes a re-import of the table.
     const { pool } = context;
@@ -315,7 +350,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('change index id by changing column type', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Change index replica id by changing column type
     // Causes a re-import of the table.
     // Secondary functionality tested here is that replica id column order stays
@@ -348,24 +383,30 @@ function defineTests(factory: storage.TestStorageFactory) {
       PUT_T2
     ]);
 
-    expect(data.slice(2, 4).sort(compareIds)).toMatchObject([
-      // Truncate - any order
-      REMOVE_T1,
-      REMOVE_T2
-    ]);
-
-    // Snapshot - order doesn't matter
-    expect(data.slice(4, 7).sort(compareIds)).toMatchObject([PUT_T1, PUT_T2, PUT_T3]);
-
-    expect(data.slice(7).sort(compareIds)).toMatchObject([
-      // Replicated insert
-      // We may eventually be able to de-duplicate this
-      PUT_T3
-    ]);
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2, PUT_T3]);
+
+    // Previously had more specific tests, but this varies too much based on timing:
+    // expect(data.slice(2, 4).sort(compareIds)).toMatchObject([
+    //   // Truncate - any order
+    //   REMOVE_T1,
+    //   REMOVE_T2
+    // ]);
+
+    // // Snapshot - order doesn't matter
+    // expect(data.slice(4, 7).sort(compareIds)).toMatchObject([PUT_T1, PUT_T2, PUT_T3]);
+
+    // expect(data.slice(7).sort(compareIds)).toMatchObject([
+    //   // Replicated insert
+    //   // We may eventually be able to de-duplicate this
+    //   PUT_T3
+    // ]);
   });
 
   test('add to publication', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Add table to publication after initial replication
     const { pool } = context;
 
@@ -401,12 +442,14 @@ function defineTests(factory: storage.TestStorageFactory) {
       PUT_T3
     ]);
 
-    const metrics = await storage.factory.getStorageMetrics();
-    expect(metrics.replication_size_bytes).toBeGreaterThan(0);
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2, PUT_T3]);
   });
 
   test('add to publication (not in sync rules)', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Add table to publication after initial replication
     // Since the table is not in sync rules, it should not be replicated.
     const { pool } = context;
@@ -430,13 +473,10 @@ function defineTests(factory: storage.TestStorageFactory) {
 
     const data = await context.getBucketData('global[]');
     expect(data).toMatchObject([]);
-
-    const metrics = await storage.factory.getStorageMetrics();
-    expect(metrics.replication_size_bytes).toMatchSnapshot();
   });
 
   test('replica identity nothing', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Technically not a schema change, but fits here.
     // Replica ID works a little differently here - the table doesn't have
     // one defined, but we generate a unique one for each replicated row.
@@ -475,10 +515,15 @@ function defineTests(factory: storage.TestStorageFactory) {
       REMOVE_T1,
       REMOVE_T2
     ]);
+
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([]);
   });
 
   test('replica identity default without PK', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     // Same as no replica identity
     const { pool } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
@@ -513,6 +558,11 @@ function defineTests(factory: storage.TestStorageFactory) {
       REMOVE_T1,
       REMOVE_T2
     ]);
+
+    // "Reduce" the bucket to get a stable output to test.
+    // slice(1) to skip the CLEAR op.
+    const reduced = reduceBucket(data).slice(1);
+    expect(reduced.sort(compareIds)).toMatchObject([]);
   });
 
   // Test consistency of table snapshots.
@@ -525,7 +575,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   //   await new Promise((resolve) => setTimeout(resolve, 100));
   //   await this.snapshotTable(batch, db, result.table);
   test('table snapshot consistency', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
 
     await context.updateSyncRules(BASIC_SYNC_RULES);
@@ -592,7 +642,7 @@ function defineTests(factory: storage.TestStorageFactory) {
   });
 
   test('custom types', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
 
     await context.updateSyncRules(`
 streams:

package/test/src/slow_tests.test.ts

@@ -7,6 +7,7 @@ import {
   connectPgPool,
   describeWithStorage,
   getClientCheckpoint,
+  StorageVersionTestContext,
   TEST_CONNECTION_OPTIONS
 } from './util.js';
 
@@ -14,7 +15,11 @@ import * as pgwire from '@powersync/service-jpgwire';
 import { SqliteRow } from '@powersync/service-sync-rules';
 
 import { PgManager } from '@module/replication/PgManager.js';
-import { createCoreReplicationMetrics, initializeCoreReplicationMetrics, storage } from '@powersync/service-core';
+import {
+  createCoreReplicationMetrics,
+  initializeCoreReplicationMetrics,
+  updateSyncRulesFromYaml
+} from '@powersync/service-core';
 import { METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
 import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import * as postgres_storage from '@powersync/service-module-postgres-storage';
@@ -22,12 +27,12 @@ import * as timers from 'node:timers/promises';
 import { CustomTypeRegistry } from '@module/types/registry.js';
 
 describe.skipIf(!(env.CI || env.SLOW_TESTS))('slow tests', function () {
-  describeWithStorage({ timeout: 120_000 }, function (factory) {
-    defineSlowTests(factory);
+  describeWithStorage({ timeout: 120_000 }, function ({ factory, storageVersion }) {
+    defineSlowTests({ factory, storageVersion });
   });
 });
 
-function defineSlowTests(factory: storage.TestStorageFactory) {
+function defineSlowTests({ factory, storageVersion }: StorageVersionTestContext) {
   let walStream: WalStream | undefined;
   let connections: PgManager | undefined;
   let abortController: AbortController | undefined;
@@ -81,7 +86,7 @@ bucket_definitions:
     data:
       - SELECT * FROM "test_data"
 `;
-    const syncRules = await f.updateSyncRules({ content: syncRuleContent });
+    const syncRules = await f.updateSyncRules(updateSyncRulesFromYaml(syncRuleContent, { storageVersion }));
     const storage = f.getInstance(syncRules);
     abortController = new AbortController();
     const options: WalStreamOptions = {
@@ -306,7 +311,8 @@ bucket_definitions:
     data:
       - SELECT id, description FROM "test_data"
 `;
-    const syncRules = await f.updateSyncRules({ content: syncRuleContent });
+
+    const syncRules = await f.updateSyncRules(updateSyncRulesFromYaml(syncRuleContent, { storageVersion }));
     const storage = f.getInstance(syncRules);
 
     // 1. Setup some base data that will be replicated in initial replication

package/test/src/util.ts

@@ -2,12 +2,18 @@ import { PostgresRouteAPIAdapter } from '@module/api/PostgresRouteAPIAdapter.js'
 import * as types from '@module/types/types.js';
 import * as lib_postgres from '@powersync/lib-service-postgres';
 import { logger } from '@powersync/lib-services-framework';
-import { BucketStorageFactory, InternalOpId, TestStorageFactory } from '@powersync/service-core';
+import {
+  BucketStorageFactory,
+  CURRENT_STORAGE_VERSION,
+  InternalOpId,
+  LEGACY_STORAGE_VERSION,
+  TestStorageFactory
+} from '@powersync/service-core';
 import * as pgwire from '@powersync/service-jpgwire';
 import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import * as postgres_storage from '@powersync/service-module-postgres-storage';
-import { env } from './env.js';
 import { describe, TestOptions } from 'vitest';
+import { env } from './env.js';
 
 export const TEST_URI = env.PG_TEST_URL;
 
@@ -20,14 +26,34 @@ export const INITIALIZED_POSTGRES_STORAGE_FACTORY = postgres_storage.test_utils.
   url: env.PG_STORAGE_TEST_URL
 });
 
-export function describeWithStorage(options: TestOptions, fn: (factory: TestStorageFactory) => void) {
-  describe.skipIf(!env.TEST_MONGO_STORAGE)(`mongodb storage`, options, function () {
-    fn(INITIALIZED_MONGO_STORAGE_FACTORY);
-  });
+const TEST_STORAGE_VERSIONS = [LEGACY_STORAGE_VERSION, CURRENT_STORAGE_VERSION];
+
+export interface StorageVersionTestContext {
+  factory: TestStorageFactory;
+  storageVersion: number;
+}
 
-  describe.skipIf(!env.TEST_POSTGRES_STORAGE)(`postgres storage`, options, function () {
-    fn(INITIALIZED_POSTGRES_STORAGE_FACTORY);
-  });
+export function describeWithStorage(options: TestOptions, fn: (context: StorageVersionTestContext) => void) {
+  const describeFactory = (storageName: string, factory: TestStorageFactory) => {
+    describe(`${storageName} storage`, options, function () {
+      for (const storageVersion of TEST_STORAGE_VERSIONS) {
+        describe(`storage v${storageVersion}`, function () {
+          fn({
+            factory,
+            storageVersion
+          });
+        });
+      }
+    });
+  };
+
+  if (env.TEST_MONGO_STORAGE) {
+    describeFactory('mongodb', INITIALIZED_MONGO_STORAGE_FACTORY);
+  }
+
+  if (env.TEST_POSTGRES_STORAGE) {
+    describeFactory('postgres', INITIALIZED_POSTGRES_STORAGE_FACTORY);
+  }
 }
 
 export const TEST_CONNECTION_OPTIONS = types.normalizeConnectionConfig({

package/test/src/validation.test.ts

@@ -3,6 +3,7 @@ import { expect, test } from 'vitest';
 
 import { INITIALIZED_MONGO_STORAGE_FACTORY } from './util.js';
 import { WalStreamTestContext } from './wal_stream_utils.js';
+import { updateSyncRulesFromYaml } from '@powersync/service-core';
 
 test('validate tables', async () => {
   await using context = await WalStreamTestContext.open(INITIALIZED_MONGO_STORAGE_FACTORY);
@@ -19,15 +20,15 @@ bucket_definitions:
       - SELECT * FROM "other%"
 `;
 
-  const syncRules = await context.factory.updateSyncRules({ content: syncRuleContent });
+  const syncRules = await context.factory.updateSyncRules(updateSyncRulesFromYaml(syncRuleContent));
 
-  const tablePatterns = syncRules.parsed({ defaultSchema: 'public' }).sync_rules.getSourceTables();
+  const tablePatterns = syncRules.parsed({ defaultSchema: 'public' }).sync_rules.config.getSourceTables();
   const tableInfo = await getDebugTablesInfo({
     db: pool,
     publicationName: context.publicationName,
     connectionTag: context.connectionTag,
     tablePatterns: tablePatterns,
-    syncRules: syncRules.parsed({ defaultSchema: 'public' }).sync_rules
+    syncRules: syncRules.parsed({ defaultSchema: 'public' }).sync_rules.config
   });
   expect(tableInfo).toEqual([
     {

package/test/src/wal_stream.test.ts

@@ -1,11 +1,10 @@
 import { MissingReplicationSlotError } from '@module/replication/WalStream.js';
-import { storage } from '@powersync/service-core';
 import { METRICS_HELPER, putOp, removeOp } from '@powersync/service-core-tests';
 import { pgwireRows } from '@powersync/service-jpgwire';
 import { ReplicationMetric } from '@powersync/service-types';
 import * as crypto from 'crypto';
-import { afterAll, beforeAll, describe, expect, test } from 'vitest';
-import { describeWithStorage } from './util.js';
+import { describe, expect, test } from 'vitest';
+import { describeWithStorage, StorageVersionTestContext } from './util.js';
 import { WalStreamTestContext, withMaxWalSize } from './wal_stream_utils.js';
 import { JSONBig } from '@powersync/service-jsonbig';
 
@@ -20,9 +19,12 @@ describe('wal stream', () => {
   describeWithStorage({ timeout: 20_000 }, defineWalStreamTests);
 });
 
-function defineWalStreamTests(factory: storage.TestStorageFactory) {
+function defineWalStreamTests({ factory, storageVersion }: StorageVersionTestContext) {
+  const openContext = (options?: Parameters<typeof WalStreamTestContext.open>[1]) => {
+    return WalStreamTestContext.open(factory, { ...options, storageVersion });
+  };
   test('replicating basic values', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(`
 bucket_definitions:
@@ -57,7 +59,7 @@ bucket_definitions:
   });
 
   test('replicating case sensitive table', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(`
       bucket_definitions:
@@ -88,7 +90,7 @@ bucket_definitions:
   });
 
   test('replicating TOAST values', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(`
       bucket_definitions:
@@ -126,7 +128,7 @@ bucket_definitions:
   });
 
   test('replicating TRUNCATE', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     const syncRuleContent = `
 bucket_definitions:
@@ -157,7 +159,7 @@ bucket_definitions:
   });
 
   test('replicating changing primary key', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
     await pool.query(`DROP TABLE IF EXISTS test_data`);
@@ -198,7 +200,7 @@ bucket_definitions:
   });
 
   test('initial sync', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
 
@@ -217,7 +219,7 @@ bucket_definitions:
   });
 
   test('record too large', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     await context.updateSyncRules(`bucket_definitions:
       global:
         data:
@@ -254,7 +256,7 @@ bucket_definitions:
   });
 
   test('table not in sync rules', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);
 
@@ -280,7 +282,7 @@ bucket_definitions:
 
   test('reporting slot issues', async () => {
     {
-      await using context = await WalStreamTestContext.open(factory);
+      await using context = await openContext();
       const { pool } = context;
       await context.updateSyncRules(`
 bucket_definitions:
@@ -310,7 +312,7 @@ bucket_definitions:
     }
 
     {
-      await using context = await WalStreamTestContext.open(factory, { doNotClear: true });
+      await using context = await openContext({ doNotClear: true });
       const { pool } = context;
       await pool.query('DROP PUBLICATION powersync');
       await pool.query(`UPDATE test_data SET description = 'updated'`);
@@ -345,7 +347,7 @@ bucket_definitions:
 
   test('dropped replication slot', async () => {
     {
-      await using context = await WalStreamTestContext.open(factory);
+      await using context = await openContext();
       const { pool } = context;
       await context.updateSyncRules(`
 bucket_definitions:
@@ -375,7 +377,7 @@ bucket_definitions:
     }
 
     {
-      await using context = await WalStreamTestContext.open(factory, { doNotClear: true });
+      await using context = await openContext({ doNotClear: true });
       const { pool } = context;
       const storage = await context.factory.getActiveStorage();
 
@@ -396,7 +398,7 @@ bucket_definitions:
   });
 
   test('replication slot lost', async () => {
-    await using baseContext = await WalStreamTestContext.open(factory, { doNotClear: true });
+    await using baseContext = await openContext({ doNotClear: true });
 
     const serverVersion = await baseContext.connectionManager.getServerVersion();
     if (serverVersion!.compareMain('13.0.0') < 0) {
@@ -408,7 +410,7 @@ bucket_definitions:
     await using s = await withMaxWalSize(baseContext.pool, '100MB');
 
     {
-      await using context = await WalStreamTestContext.open(factory);
+      await using context = await openContext();
       const { pool } = context;
       await context.updateSyncRules(`
 bucket_definitions:
@@ -438,7 +440,7 @@ bucket_definitions:
     }
 
     {
-      await using context = await WalStreamTestContext.open(factory, { doNotClear: true });
+      await using context = await openContext({ doNotClear: true });
       const { pool } = context;
       const storage = await context.factory.getActiveStorage();
       const slotName = storage?.slot_name!;
@@ -479,7 +481,7 @@ bucket_definitions:
   });
 
   test('old date format', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     await context.updateSyncRules(BASIC_SYNC_RULES);
 
     const { pool } = context;
@@ -494,7 +496,7 @@ bucket_definitions:
   });
 
   test('new date format', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     await context.updateSyncRules(`
 streams:
   stream:
@@ -515,7 +517,7 @@ config:
   });
 
   test('custom types', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
 
     await context.updateSyncRules(`
 streams:
@@ -550,7 +552,7 @@ config:
   });
 
   test('custom types in primary key', async () => {
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
 
     await context.updateSyncRules(`
 streams:
@@ -576,7 +578,7 @@ config:
   test('replica identity handling', async () => {
     // This specifically test a case of timestamps being used as part of the replica identity.
     // There was a regression in versions 1.15.0-1.15.5, which this tests for.
-    await using context = await WalStreamTestContext.open(factory);
+    await using context = await openContext();
     const { pool } = context;
     await context.updateSyncRules(BASIC_SYNC_RULES);