@powersync/service-module-mysql 0.12.3 → 0.12.4

package/src/replication/zongji/zongji-utils.ts

@@ -1,14 +1,14 @@
 import {
   BinLogEvent,
   BinLogGTIDLogEvent,
-  BinLogRowEvent,
+  BinLogHeartbeatEvent,
+  BinLogHeartbeatEvent_V2,
+  BinLogQueryEvent,
   BinLogRotationEvent,
-  BinLogTableMapEvent,
+  BinLogRowEvent,
   BinLogRowUpdateEvent,
-  BinLogXidEvent,
-  BinLogQueryEvent,
-  BinLogHeartbeatEvent,
-  BinLogHeartbeatEvent_V2
+  BinLogTableMapEvent,
+  BinLogXidEvent
 } from '@powersync/mysql-zongji';
 
 export function eventIsGTIDLog(event: BinLogEvent): event is BinLogGTIDLogEvent {

package/src/utils/mysql-utils.ts

@@ -1,9 +1,9 @@
 import { logger } from '@powersync/lib-services-framework';
+import { SourceEntityDescriptor } from '@powersync/service-core';
 import mysql from 'mysql2';
 import mysqlPromise from 'mysql2/promise';
-import * as types from '../types/types.js';
 import { coerce, gte, satisfies } from 'semver';
-import { SourceEntityDescriptor } from '@powersync/service-core';
+import * as types from '../types/types.js';
 
 export type RetriedQueryOptions = {
   connection: mysqlPromise.Connection;

package/src/utils/parser-utils.ts

@@ -1,4 +1,4 @@
-import { Alter, AST, Create, Drop, TruncateStatement, RenameStatement, DropIndexStatement } from 'node-sql-parser';
+import { Alter, AST, Create, Drop, DropIndexStatement, RenameStatement, TruncateStatement } from 'node-sql-parser';
 
 // We ignore create table statements, since even in the worst case we will pick up the changes when row events for that
 // table are received.

package/test/src/BinLogListener.test.ts

@@ -1,6 +1,10 @@
-import { afterAll, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
-import { BinLogListener, SchemaChange, SchemaChangeType } from '@module/replication/zongji/BinLogListener.js';
 import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManager.js';
+import { BinLogListener, SchemaChange, SchemaChangeType } from '@module/replication/zongji/BinLogListener.js';
+import { getMySQLVersion, qualifiedMySQLTable, satisfiesVersion } from '@module/utils/mysql-utils.js';
+import { TablePattern } from '@powersync/service-sync-rules';
+import crypto from 'crypto';
+import { v4 as uuid } from 'uuid';
+import { afterAll, beforeAll, beforeEach, describe, expect, test, vi } from 'vitest';
 import {
   clearTestDb,
   createBinlogListener,
@@ -8,10 +12,6 @@ import {
   TEST_CONNECTION_OPTIONS,
   TestBinLogEventHandler
 } from './util.js';
-import { v4 as uuid } from 'uuid';
-import { getMySQLVersion, qualifiedMySQLTable, satisfiesVersion } from '@module/utils/mysql-utils.js';
-import crypto from 'crypto';
-import { TablePattern } from '@powersync/service-sync-rules';
 
 describe('BinlogListener tests', { timeout: 60_000 }, () => {
   const MAX_QUEUE_CAPACITY_MB = 1;
@@ -463,9 +463,13 @@ describe('BinlogListener tests', { timeout: 60_000 }, () => {
     await insertRows(connectionManager, 1);
     // multi_schema database insert into test_DATA_multi
     await connectionManager.query(`INSERT INTO ${testTable}(id, description) VALUES('${uuid()}','test')`);
-    await connectionManager.query(`DROP TABLE ${testTable}`);
+    // Wait for both row entries to appear on the binlog. This avoids a rare race condition in MySQL 5.7
+    // where the drop table can hang if run immediately after the table was locked by an insert
+    await vi.waitFor(() => expect(eventHandler.rowsWritten).equals(2), { timeout: 5000 });
 
+    await connectionManager.query(`DROP TABLE ${testTable}`);
     await waitForSchemaChanges(1);
+
     await binLogListener.stop();
     expect(eventHandler.rowsWritten).toBe(2);
     assertSchemaChange(eventHandler.schemaChanges[0], SchemaChangeType.DROP_TABLE, 'multi_schema', 'test_DATA_multi');

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:

package/test/src/BinlogStreamUtils.ts

@@ -17,8 +17,8 @@ import {
 } from '@powersync/service-core';
 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

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/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);