@powersync/service-module-postgres 0.0.0-dev-20241128134723 → 0.0.0-dev-20241210162153

package/test/src/slow_tests.test.ts

@@ -8,10 +8,11 @@ import * as pgwire from '@powersync/service-jpgwire';
 import { SqliteRow } from '@powersync/service-sync-rules';
 
 import { mapOpEntry, MongoBucketStorage } from '@/storage/storage-index.js';
-import { reduceBucket, validateCompactedBucket } from '@core-tests/bucket_validation.js';
+import { validateCompactedBucket } from '@core-tests/bucket_validation.js';
 import { MONGO_STORAGE_FACTORY, StorageFactory } from '@core-tests/util.js';
 import { PgManager } from '@module/replication/PgManager.js';
 import * as timers from 'node:timers/promises';
+import { reduceBucket } from '@powersync/service-core';
 
 describe('slow tests - mongodb', function () {
   // These are slow, inconsistent tests.

package/test/src/util.ts

@@ -6,6 +6,7 @@ import { BucketStorageFactory, Metrics, MongoBucketStorage, OpId } from '@powers
 import * as pgwire from '@powersync/service-jpgwire';
 import { pgwireRows } from '@powersync/service-jpgwire';
 import { env } from './env.js';
+import { PostgresRouteAPIAdapter } from '@module/api/PostgresRouteAPIAdapter.js';
 
 // The metrics need to be initialized before they can be used
 await Metrics.initialise({
@@ -82,7 +83,8 @@ export async function getClientCheckpoint(
 ): Promise<OpId> {
   const start = Date.now();
 
-  const [{ lsn }] = pgwireRows(await db.query(`SELECT pg_logical_emit_message(false, 'powersync', 'ping') as lsn`));
+  const api = new PostgresRouteAPIAdapter(db);
+  const lsn = await api.getReplicationHead();
 
   // This old API needs a persisted checkpoint id.
   // Since we don't use LSNs anymore, the only way to get that is to wait.

package/test/src/validation.test.ts

@@ -1,17 +1,15 @@
 import { MONGO_STORAGE_FACTORY } from '@core-tests/util.js';
-import { expect, test } from 'vitest';
-import { walStreamTest } from './wal_stream_utils.js';
 import { getDebugTablesInfo } from '@module/replication/replication-utils.js';
+import { expect, test } from 'vitest';
+import { WalStreamTestContext } from './wal_stream_utils.js';
 
-// Not quite a walStreamTest, but it helps to manage the connection
-test(
-  'validate tables',
-  walStreamTest(MONGO_STORAGE_FACTORY, async (context) => {
-    const { pool } = context;
+test('validate tables', async () => {
+  await using context = await WalStreamTestContext.open(MONGO_STORAGE_FACTORY);
+  const { pool } = context;
 
-    await pool.query(`CREATE TABLE test_data(id uuid primary key default uuid_generate_v4(), description text)`);
+  await pool.query(`CREATE TABLE test_data(id uuid primary key default uuid_generate_v4(), description text)`);
 
-    const syncRuleContent = `
+  const syncRuleContent = `
 bucket_definitions:
   global:
     data:
@@ -20,45 +18,44 @@ bucket_definitions:
       - SELECT * FROM "other%"
 `;
 
-    const syncRules = await context.factory.updateSyncRules({ content: syncRuleContent });
+  const syncRules = await context.factory.updateSyncRules({ content: syncRuleContent });
 
-    const tablePatterns = syncRules.parsed({ defaultSchema: 'public' }).sync_rules.getSourceTables();
-    const tableInfo = await getDebugTablesInfo({
-      db: pool,
-      publicationName: context.publicationName,
-      connectionTag: context.connectionTag,
-      tablePatterns: tablePatterns,
-      syncRules: syncRules.parsed({ defaultSchema: 'public' }).sync_rules
-    });
-    expect(tableInfo).toEqual([
-      {
+  const tablePatterns = syncRules.parsed({ defaultSchema: 'public' }).sync_rules.getSourceTables();
+  const tableInfo = await getDebugTablesInfo({
+    db: pool,
+    publicationName: context.publicationName,
+    connectionTag: context.connectionTag,
+    tablePatterns: tablePatterns,
+    syncRules: syncRules.parsed({ defaultSchema: 'public' }).sync_rules
+  });
+  expect(tableInfo).toEqual([
+    {
+      schema: 'public',
+      pattern: 'test_data',
+      wildcard: false,
+      table: {
         schema: 'public',
-        pattern: 'test_data',
-        wildcard: false,
-        table: {
-          schema: 'public',
-          name: 'test_data',
-          replication_id: ['id'],
-          pattern: undefined,
-          data_queries: true,
-          parameter_queries: false,
-          errors: []
-        }
-      },
-      {
+        name: 'test_data',
+        replication_id: ['id'],
+        pattern: undefined,
+        data_queries: true,
+        parameter_queries: false,
+        errors: []
+      }
+    },
+    {
+      schema: 'public',
+      pattern: 'other',
+      wildcard: false,
+      table: {
         schema: 'public',
-        pattern: 'other',
-        wildcard: false,
-        table: {
-          schema: 'public',
-          name: 'other',
-          replication_id: [],
-          data_queries: true,
-          parameter_queries: false,
-          errors: [{ level: 'warning', message: 'Table "public"."other" not found.' }]
-        }
-      },
-      { schema: 'public', pattern: 'other%', wildcard: true, tables: [] }
-    ]);
-  })
-);
+        name: 'other',
+        replication_id: [],
+        data_queries: true,
+        parameter_queries: false,
+        errors: [{ level: 'warning', message: 'Table "public"."other" not found.' }]
+      }
+    },
+    { schema: 'public', pattern: 'other%', wildcard: true, tables: [] }
+  ]);
+});