@powersync/service-module-mysql 0.0.0-dev-20260803144812 → 0.0.0-dev-20260929095716

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

@@ -319,10 +319,11 @@ function defineTests(config: storage.TestStorageConfig) {
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
 
     await context.replicateSnapshot();
-    await context.startStreaming();
 
     await connectionManager.query(`ALTER TABLE test_data ADD COLUMN new_column TEXT`);
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+    // Replay the DDL after the insert commits so the replacement snapshot includes it.
+    await context.startStreaming();
 
     const data = await context.getBucketData('global[]');
 
@@ -349,43 +350,54 @@ function defineTests(config: storage.TestStorageConfig) {
     ]);
   });
 
-  test('Change Replication Identity from full to index by adding a unique constraint', async () => {
-    await using context = await BinlogStreamTestContext.open(factory);
-    // Change replica id full by adding a unique index that can serve as the replication id
+  test.each([true, false])(
+    'Change Replication Identity from full to index by adding a unique constraint (insert in snapshot: %s)',
+    async (insertInSnapshot) => {
+      await using context = await BinlogStreamTestContext.open(factory);
+      // Change replica id full by adding a unique index that can serve as the replication id
 
-    await context.updateSyncRules(BASIC_SYNC_RULES);
+      await context.updateSyncRules(BASIC_SYNC_RULES);
 
-    const { connectionManager } = context;
-    // No primary key, no unique column, so full replication identity will be used
-    await connectionManager.query(`CREATE TABLE test_data (id CHAR(36), description TEXT)`);
-    await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
+      const { connectionManager } = context;
+      // No primary key, no unique column, so full replication identity will be used
+      await connectionManager.query(`CREATE TABLE test_data (id CHAR(36), description TEXT)`);
+      await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
 
-    await context.replicateSnapshot();
-    await context.startStreaming();
+      await context.replicateSnapshot();
 
-    await connectionManager.query(`ALTER TABLE test_data ADD UNIQUE (id)`);
-    await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+      await connectionManager.query(`ALTER TABLE test_data ADD UNIQUE (id)`);
+      if (!insertInSnapshot) {
+        await context.startStreaming();
+        // Wait for the replacement snapshot before inserting the new row.
+        await context.getCheckpoint();
+      }
+      await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+      if (insertInSnapshot) {
+        // Commit the insert before replaying the DDL so the snapshot must include it.
+        await context.startStreaming();
+      }
 
-    const data = await context.getBucketData('global[]');
-    const reduced = test_utils.reduceBucket(data).slice(1);
-    expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2]);
+      const data = await context.getBucketData('global[]');
+      const reduced = test_utils.reduceBucket(data).slice(1);
+      expect(reduced.sort(compareIds)).toMatchObject([PUT_T1, PUT_T2]);
 
-    expect(data.slice(0, 2)).toMatchObject([
-      // Initial inserts
-      PUT_T1,
-      // Truncate
-      REMOVE_T1
-    ]);
+      expect(data.slice(0, 2)).toMatchObject([
+        // Initial inserts
+        PUT_T1,
+        // Truncate
+        REMOVE_T1
+      ]);
 
-    // Snapshot - order doesn't matter
-    expect(data.slice(2)).toMatchObject([
-      // Snapshot inserts
-      PUT_T1,
-      PUT_T2,
-      // Replicated insert
-      PUT_T2
-    ]);
-  });
+      // Snapshot - order doesn't matter
+      expect(data.slice(2)).toMatchObject([
+        // Snapshot inserts
+        PUT_T1,
+        ...(insertInSnapshot ? [PUT_T2] : []),
+        // Replicated insert
+        PUT_T2
+      ]);
+    }
+  );
 
   test('Change Replication Identity from full to index by adding a unique index', async () => {
     await using context = await BinlogStreamTestContext.open(factory);
@@ -398,10 +410,11 @@ function defineTests(config: storage.TestStorageConfig) {
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
 
     await context.replicateSnapshot();
-    await context.startStreaming();
 
     await connectionManager.query(`CREATE UNIQUE INDEX id_idx ON test_data (id)`);
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+    // Replay the DDL after the insert commits so the replacement snapshot includes it.
+    await context.startStreaming();
 
     const data = await context.getBucketData('global[]');
     const reduced = test_utils.reduceBucket(data).slice(1);
@@ -436,10 +449,11 @@ function defineTests(config: storage.TestStorageConfig) {
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
 
     await context.replicateSnapshot();
-    await context.startStreaming();
 
     await connectionManager.query(`ALTER TABLE test_data DROP INDEX id`);
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+    // Replay the DDL after the insert commits so the replacement snapshot includes it.
+    await context.startStreaming();
 
     const data = await context.getBucketData('global[]');
     const reduced = test_utils.reduceBucket(data).slice(1);
@@ -471,10 +485,11 @@ function defineTests(config: storage.TestStorageConfig) {
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t1','test1')`);
 
     await context.replicateSnapshot();
-    await context.startStreaming();
 
     await connectionManager.query(`ALTER TABLE test_data MODIFY COLUMN id VARCHAR(36)`);
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+    // Replay the DDL after the insert commits so the replacement snapshot includes it.
+    await context.startStreaming();
 
     const data = await context.getBucketData('global[]');
     const reduced = test_utils.reduceBucket(data).slice(1);
@@ -513,8 +528,11 @@ function defineTests(config: storage.TestStorageConfig) {
     await context.startStreaming();
 
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t2','test2')`);
+    await context.getCheckpoint();
 
     await connectionManager.query(`ALTER TABLE test_data MODIFY COLUMN id VARCHAR(36)`);
+    // Finish the replacement snapshot before inserting t3, which is streamed once.
+    await context.getCheckpoint();
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('t3','test3')`);
 
     const data = await context.getBucketData('global[]');
@@ -535,9 +553,9 @@ function defineTests(config: storage.TestStorageConfig) {
     ]);
 
     // Snapshot - order doesn't matter
-    expect(data.slice(4, 7).sort(compareIds)).toMatchObject([PUT_T1, PUT_T2, PUT_T3]);
+    expect(data.slice(4, 6).sort(compareIds)).toMatchObject([PUT_T1, PUT_T2]);
 
-    expect(data.slice(7).sort(compareIds)).toMatchObject([
+    expect(data.slice(6).sort(compareIds)).toMatchObject([
       // Replicated insert
       PUT_T3
     ]);

package/test/src/util.ts

@@ -9,7 +9,7 @@ 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 { describe, TestOptions } from 'vitest';
+import { describe, TestOptions, vi } from 'vitest';
 import { env } from './env.js';
 
 export const TEST_URI = env.MYSQL_TEST_URI;
@@ -28,6 +28,17 @@ export const INITIALIZED_POSTGRES_STORAGE_FACTORY = postgres_storage.test_utils.
   url: env.PG_STORAGE_TEST_URL
 });
 
+export function createMockMySQLConnection(queryHandler: (sql: string, params?: unknown[]) => Promise<unknown>): {
+  connection: mysqlPromise.Connection;
+  query: ReturnType<typeof vi.fn>;
+} {
+  const query = vi.fn(queryHandler);
+  return {
+    connection: { query } as unknown as mysqlPromise.Connection,
+    query
+  };
+}
+
 export function describeWithStorage(options: TestOptions, fn: (factory: TestStorageConfig) => void) {
   describe.skipIf(!env.TEST_MONGO_STORAGE)(`mongodb storage`, options, function () {
     fn(INITIALIZED_MONGO_STORAGE_FACTORY);
@@ -71,11 +82,19 @@ export async function getFromGTID(connectionManager: MySQLConnectionManager) {
   return fromGTID;
 }
 
+export async function getActiveServerUuid(connectionManager: MySQLConnectionManager) {
+  const connection = await connectionManager.getConnection();
+  const activeServerUuid = await common.readServerUuid(connection);
+  connection.release();
+  return activeServerUuid;
+}
+
 export interface CreateBinlogListenerParams {
   connectionManager: MySQLConnectionManager;
   eventHandler: BinLogEventHandler;
   sourceTables: TablePattern[];
   startGTID?: common.ReplicatedGTID;
+  ctrlConnectionProbeTimeoutMs?: number;
 }
 export async function createBinlogListener(params: CreateBinlogListenerParams): Promise<BinLogListener> {
   let { connectionManager, eventHandler, sourceTables, startGTID } = params;
@@ -84,12 +103,16 @@ export async function createBinlogListener(params: CreateBinlogListenerParams):
     startGTID = await getFromGTID(connectionManager);
   }
 
+  const activeServerUuid = await getActiveServerUuid(connectionManager);
+
   return new BinLogListener({
     connectionManager: connectionManager,
     eventHandler: eventHandler,
     startGTID: startGTID!,
     sourceTables: sourceTables,
-    serverId: createRandomServerId(1)
+    serverId: createRandomServerId(1),
+    activeServerUuid: activeServerUuid,
+    ctrlConnectionProbeTimeoutMs: params.ctrlConnectionProbeTimeoutMs
   });
 }
 
@@ -100,6 +123,7 @@ export class TestBinLogEventHandler implements BinLogEventHandler {
   commitCount = 0;
   schemaChanges: SchemaChange[] = [];
   lastKeepAlive: string | undefined;
+  lastCommitLsn: string | undefined;
 
   unpause: ((value: void | PromiseLike<void>) => void) | undefined;
   private pausedPromise: Promise<void> | undefined;
@@ -127,6 +151,7 @@ export class TestBinLogEventHandler implements BinLogEventHandler {
 
   async onCommit(lsn: string) {
     this.commitCount++;
+    this.lastCommitLsn = lsn;
   }
 
   async onSchemaChange(change: SchemaChange) {