@powersync/service-module-mysql 0.0.0-dev-20260225160713 → 0.0.0-dev-20260511080634

package/test/src/BinLogStream.test.ts

@@ -1,3 +1,4 @@
+import { qualifiedMySQLTable } from '@module/utils/mysql-utils.js';
 import { storage } from '@powersync/service-core';
 import { METRICS_HELPER, putOp, removeOp } from '@powersync/service-core-tests';
 import { ReplicationMetric } from '@powersync/service-types';
@@ -5,7 +6,6 @@ import { v4 as uuid } from 'uuid';
 import { describe, expect, test } from 'vitest';
 import { BinlogStreamTestContext } from './BinlogStreamUtils.js';
 import { createTestDb, describeWithStorage } from './util.js';
-import { qualifiedMySQLTable } from '@module/utils/mysql-utils.js';
 
 const BASIC_SYNC_RULES = `
 bucket_definitions:
@@ -18,7 +18,9 @@ describe('BinLogStream tests', () => {
   describeWithStorage({ timeout: 20_000 }, defineBinlogStreamTests);
 });
 
-function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
+function defineBinlogStreamTests(config: storage.TestStorageConfig) {
+  const factory = config.factory;
+
   test('Replicate basic values', async () => {
     await using context = await BinlogStreamTestContext.open(factory);
     const { connectionManager } = context;

package/test/src/BinlogStreamUtils.ts

@@ -15,10 +15,10 @@ import {
   SyncRulesBucketStorage,
   updateSyncRulesFromYaml
 } from '@powersync/service-core';
-import { METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
+import { bucketRequest, METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
 import mysqlPromise from 'mysql2/promise';
-import { clearTestDb, TEST_CONNECTION_OPTIONS } from './util.js';
 import timers from 'timers/promises';
+import { clearTestDb, TEST_CONNECTION_OPTIONS } from './util.js';
 
 /**
  * Tests operating on the binlog stream need to configure the stream and manage asynchronous
@@ -33,6 +33,7 @@ export class BinlogStreamTestContext {
   private streamPromise?: Promise<void>;
   public storage?: SyncRulesBucketStorage;
   private replicationDone = false;
+  private syncRulesContent?: storage.PersistedSyncRulesContent;
 
   static async open(factory: storage.TestStorageFactory, options?: { doNotClear?: boolean }) {
     const f = await factory({ doNotClear: options?.doNotClear });
@@ -73,6 +74,7 @@ export class BinlogStreamTestContext {
     const syncRules = await this.factory.updateSyncRules(
       updateSyncRulesFromYaml(content, { validate: true, storageVersion: LEGACY_STORAGE_VERSION })
     );
+    this.syncRulesContent = syncRules;
     this.storage = this.factory.getInstance(syncRules);
     return this.storage!;
   }
@@ -80,9 +82,10 @@ export class BinlogStreamTestContext {
   async loadNextSyncRules() {
     const syncRules = await this.factory.getNextSyncRulesContent();
     if (syncRules == null) {
-      throw new Error(`Next sync rules not available`);
+      throw new Error(`Next replication stream not available`);
     }
 
+    this.syncRulesContent = syncRules;
     this.storage = this.factory.getInstance(syncRules);
     return this.storage!;
   }
@@ -90,14 +93,22 @@ export class BinlogStreamTestContext {
   async loadActiveSyncRules() {
     const syncRules = await this.factory.getActiveSyncRulesContent();
     if (syncRules == null) {
-      throw new Error(`Active sync rules not available`);
+      throw new Error(`Active replication stream not available`);
     }
 
+    this.syncRulesContent = syncRules;
     this.storage = this.factory.getInstance(syncRules);
     this.replicationDone = true;
     return this.storage!;
   }
 
+  private getSyncRulesContent(): storage.PersistedSyncRulesContent {
+    if (this.syncRulesContent == null) {
+      throw new Error('Sync config not configured - call updateSyncRules() first');
+    }
+    return this.syncRulesContent;
+  }
+
   get binlogStream(): BinLogStream {
     if (this.storage == null) {
       throw new Error('updateSyncRules() first');
@@ -154,7 +165,8 @@ export class BinlogStreamTestContext {
 
   async getBucketsDataBatch(buckets: Record<string, InternalOpId>, options?: { timeout?: number }) {
     const checkpoint = await this.getCheckpoint(options);
-    const map = new Map<string, InternalOpId>(Object.entries(buckets));
+    const syncRules = this.getSyncRulesContent();
+    const map = Object.entries(buckets).map(([bucket, start]) => bucketRequest(syncRules, bucket, start));
     return test_utils.fromAsync(this.storage!.getBucketDataBatch(checkpoint, map));
   }
 
@@ -167,8 +179,9 @@ export class BinlogStreamTestContext {
     if (typeof start == 'string') {
       start = BigInt(start);
     }
+    const syncRules = this.getSyncRulesContent();
     const checkpoint = await this.getCheckpoint(options);
-    const map = new Map<string, InternalOpId>([[bucket, start]]);
+    const map = [bucketRequest(syncRules, bucket, start)];
     const batch = this.storage!.getBucketDataBatch(checkpoint, map);
     const batches = await test_utils.fromAsync(batch);
     return batches[0]?.chunkData.data ?? [];
@@ -193,7 +206,7 @@ export async function getClientCheckpoint(
     const storage = await storageFactory.getActiveStorage();
     const cp = await storage?.getCheckpoint();
     if (cp == null) {
-      throw new Error('No sync rules available');
+      throw new Error('No replication stream available');
     }
     lastCp = cp;
     if (cp.lsn && cp.lsn >= gtid.comparable) {

package/test/src/config.test.ts

@@ -1,9 +1,9 @@
-import { describe, expect, test } from 'vitest';
 import {
   normalizeConnectionConfig,
   parseMySQLConnectionParam,
   parseMySQLConnectionParams
 } from '@module/types/types.js';
+import { describe, expect, test } from 'vitest';
 
 describe('config', () => {
   test('Should resolve database', () => {

package/test/src/env.ts

@@ -3,7 +3,7 @@ import { utils } from '@powersync/lib-services-framework';
 export const env = utils.collectEnvironmentVariables({
   MYSQL_TEST_URI: utils.type.string.default('mysql://root:mypassword@localhost:3306/mydatabase'),
   MONGO_TEST_URL: utils.type.string.default('mongodb://localhost:27017/powersync_test'),
-  PG_STORAGE_TEST_URL: utils.type.string.default('postgres://postgres:postgres@localhost:5431/powersync_storage_test'),
+  PG_STORAGE_TEST_URL: utils.type.string.default('postgres://postgres:postgres@localhost:5432/powersync_storage_test'),
   CI: utils.type.boolean.default('false'),
   SLOW_TESTS: utils.type.boolean.default('false'),
   TEST_MONGO_STORAGE: utils.type.boolean.default('true'),

package/test/src/mysql-to-sqlite.test.ts

@@ -1,17 +1,16 @@
+import * as common from '@module/common/common-index.js';
+import { toColumnDescriptors } from '@module/common/common-index.js';
+import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
+import { eventIsWriteMutation, eventIsXid } from '@module/replication/zongji/zongji-utils.js';
+import { BinLogEvent, ZongJi } from '@powersync/mysql-zongji';
 import {
   applyRowContext,
   CompatibilityContext,
   SqliteInputRow,
-  SqliteRow,
   TimeValuePrecision
 } from '@powersync/service-sync-rules';
 import { afterAll, describe, expect, test } from 'vitest';
 import { clearTestDb, TEST_CONNECTION_OPTIONS } from './util.js';
-import { eventIsWriteMutation, eventIsXid } from '@module/replication/zongji/zongji-utils.js';
-import * as common from '@module/common/common-index.js';
-import { BinLogEvent, ZongJi } from '@powersync/mysql-zongji';
-import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
-import { toColumnDescriptors } from '@module/common/common-index.js';
 
 describe('MySQL Data Types', () => {
   const connectionManager = new MySQLConnectionManager(TEST_CONNECTION_OPTIONS, {});

package/test/src/mysql-utils.test.ts

@@ -1,5 +1,5 @@
-import { describe, expect, test } from 'vitest';
 import { isVersionAtLeast } from '@module/utils/mysql-utils.js';
+import { describe, expect, test } from 'vitest';
 
 describe('MySQL Utility Tests', () => {
   test('Minimum version checking ', () => {

package/test/src/parser-utils.test.ts

@@ -1,5 +1,5 @@
-import { describe, expect, test } from 'vitest';
 import { matchedSchemaChangeQuery } from '@module/utils/parser-utils.js';
+import { describe, expect, test } from 'vitest';
 
 describe('MySQL Parser Util Tests', () => {
   test('matchedSchemaChangeQuery function', () => {

package/test/src/schema-changes.test.ts

@@ -1,12 +1,12 @@
 import { compareIds, putOp, removeOp, test_utils } from '@powersync/service-core-tests';
 import { beforeAll, describe, expect, test } from 'vitest';
 
-import { storage } from '@powersync/service-core';
-import { createTestDb, describeWithStorage, TEST_CONNECTION_OPTIONS } from './util.js';
-import { BinlogStreamTestContext } from './BinlogStreamUtils.js';
-import timers from 'timers/promises';
 import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
 import { getMySQLVersion, qualifiedMySQLTable, satisfiesVersion } from '@module/utils/mysql-utils.js';
+import { storage } from '@powersync/service-core';
+import timers from 'timers/promises';
+import { BinlogStreamTestContext } from './BinlogStreamUtils.js';
+import { createTestDb, describeWithStorage, TEST_CONNECTION_OPTIONS } from './util.js';
 
 describe('MySQL Schema Changes', () => {
   describeWithStorage({ timeout: 20_000 }, defineTests);
@@ -26,7 +26,8 @@ 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(config: storage.TestStorageConfig) {
+  const factory = config.factory;
   let isMySQL57: boolean = false;
 
   beforeAll(async () => {

package/test/src/util.ts

@@ -1,16 +1,16 @@
+import * as common from '@module/common/common-index.js';
+import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
+import { BinLogEventHandler, BinLogListener, Row, SchemaChange } from '@module/replication/zongji/BinLogListener.js';
 import * as types from '@module/types/types.js';
 import { createRandomServerId, getMySQLVersion, isVersionAtLeast } from '@module/utils/mysql-utils.js';
+import { TableMapEntry } from '@powersync/mysql-zongji';
+import { TestStorageConfig } from '@powersync/service-core';
 import * as mongo_storage from '@powersync/service-module-mongodb-storage';
 import * as postgres_storage from '@powersync/service-module-postgres-storage';
+import { TablePattern } from '@powersync/service-sync-rules';
 import mysqlPromise from 'mysql2/promise';
-import { env } from './env.js';
 import { describe, TestOptions } from 'vitest';
-import { TestStorageFactory } from '@powersync/service-core';
-import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
-import { BinLogEventHandler, BinLogListener, Row, SchemaChange } from '@module/replication/zongji/BinLogListener.js';
-import { TableMapEntry } from '@powersync/mysql-zongji';
-import * as common from '@module/common/common-index.js';
-import { TablePattern } from '@powersync/service-sync-rules';
+import { env } from './env.js';
 
 export const TEST_URI = env.MYSQL_TEST_URI;
 
@@ -24,11 +24,11 @@ export const INITIALIZED_MONGO_STORAGE_FACTORY = mongo_storage.test_utils.mongoT
   isCI: env.CI
 });
 
-export const INITIALIZED_POSTGRES_STORAGE_FACTORY = postgres_storage.test_utils.postgresTestStorageFactoryGenerator({
+export const INITIALIZED_POSTGRES_STORAGE_FACTORY = postgres_storage.test_utils.postgresTestSetup({
   url: env.PG_STORAGE_TEST_URL
 });
 
-export function describeWithStorage(options: TestOptions, fn: (factory: TestStorageFactory) => void) {
+export function describeWithStorage(options: TestOptions, fn: (factory: TestStorageConfig) => void) {
   describe.skipIf(!env.TEST_MONGO_STORAGE)(`mongodb storage`, options, function () {
     fn(INITIALIZED_MONGO_STORAGE_FACTORY);
   });

package/test/tsconfig.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../../tsconfig.tests.json",
   "compilerOptions": {
-    "baseUrl": "./",
     "paths": {
       "@/*": ["../../../packages/service-core/src/*"],
       "@module/*": ["../src/*"],