@powersync/service-module-mysql 0.12.3 → 0.12.5

package/dist/utils/mysql-utils.d.ts

@@ -1,7 +1,7 @@
+import { SourceEntityDescriptor } from '@powersync/service-core';
 import mysql from 'mysql2';
 import mysqlPromise from 'mysql2/promise';
 import * as types from '../types/types.js';
-import { SourceEntityDescriptor } from '@powersync/service-core';
 export type RetriedQueryOptions = {
     connection: mysqlPromise.Connection;
     query: string;
@@ -14,7 +14,7 @@ export type RetriedQueryOptions = {
 export declare function retriedQuery(options: RetriedQueryOptions): Promise<[mysql.RowDataPacket[], mysql.FieldPacket[]]>;
 export declare function createPool(config: types.NormalizedMySQLConnectionConfig, options?: mysql.PoolOptions): mysql.Pool;
 /**
- *  Return a random server id for a given sync rule id.
+ *  Return a random server id for a given replication stream id.
  *  Expected format is: <syncRuleId>00<random number>
  *  The max value for server id in MySQL is 2^32 - 1.
  *  We use the GTID format to keep track of our position in the binlog, no state is kept by the MySQL server, therefore

package/dist/utils/mysql-utils.js

@@ -49,7 +49,7 @@ export function createPool(config, options) {
     });
 }
 /**
- *  Return a random server id for a given sync rule id.
+ *  Return a random server id for a given replication stream id.
  *  Expected format is: <syncRuleId>00<random number>
  *  The max value for server id in MySQL is 2^32 - 1.
  *  We use the GTID format to keep track of our position in the binlog, no state is kept by the MySQL server, therefore

package/dist/utils/mysql-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"mysql-utils.js","sourceRoot":"","sources":["../../src/utils/mysql-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAC;AAC3D,OAAO,KAAK,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAUhD;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,OAA4B;IAC7D,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;IAChE,KAAK,IAAI,KAAK,GAAG,OAAO,GAAI,KAAK,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;YAC1C,OAAO,UAAU,CAAC,KAAK,CAA+B,KAAK,EAAE,MAAM,CAAC,CAAC;QACvE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACf,MAAM,CAAC,CAAC;YACV,CAAC;YACD,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAA6C,EAAE,OAA2B;IACnG,MAAM,UAAU,GAAG;QACjB,EAAE,EAAE,MAAM,CAAC,MAAM;QACjB,GAAG,EAAE,MAAM,CAAC,kBAAkB;QAC9B,IAAI,EAAE,MAAM,CAAC,kBAAkB;KAChC,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,+EAA+E;IAC/E,MAAM,MAAM,GAAG,MAAM,CAAC,gBAAgB,CAAC;IAEvC,6CAA6C;IAC7C,OAAO,KAAK,CAAC,UAAU,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,IAAI,EAAE,MAAM,CAAC,QAAQ;QACrB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;QAC3C,iBAAiB,EAAE,IAAI;QACvB,cAAc,EAAE,IAAI;QACpB,QAAQ,EAAE,GAAG,EAAE,0DAA0D;QACzE,WAAW,EAAE,IAAI,EAAE,iCAAiC;QACpD,WAAW,EAAE,IAAI,EAAE,qCAAqC;QACxD,qFAAqF;QACrF,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,GAAG,CAAC,MAAM,CAAC,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtF,GAAG,CAAC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,oBAAoB,CAAC,UAAkB;IACrD,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,UAAU,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,UAAmC;IACvE,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,GAAG,MAAM,YAAY,CAAC;QAC3C,UAAU;QACV,KAAK,EAAE,6BAA6B;KACrC,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC,OAAiB,CAAC;AACzC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,cAAsB;IACtE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IACvC,MAAM,qBAAqB,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;IAErD,OAAO,GAAG,CAAC,cAAe,EAAE,qBAAsB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,aAAqB;IACrE,MAAM,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAEvC,OAAO,SAAS,CAAC,cAAe,EAAE,aAAc,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AACrE,CAAC;AAKD,MAAM,UAAU,mBAAmB,CAAC,KAAsC,EAAE,MAAe;IACzF,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC;IAC7F,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAClB,OAAO,KAAK,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,QAAQ,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC;IAClF,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC;IAC9C,CAAC;AACH,CAAC"}
+{"version":3,"file":"mysql-utils.js","sourceRoot":"","sources":["../../src/utils/mysql-utils.ts"],"names":[],"mappings":"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"}

package/dist/utils/parser-utils.d.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';
 /**
  *  Check if a query is a DDL statement that applies to tables matching any of the provided matcher functions.
  *  @param query

package/package.json

@@ -2,7 +2,7 @@
   "name": "@powersync/service-module-mysql",
   "repository": "https://github.com/powersync-ja/powersync-service",
   "types": "dist/index.d.ts",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "license": "FSL-1.1-ALv2",
   "main": "dist/index.js",
   "type": "module",
@@ -29,19 +29,19 @@
     "semver": "^7.5.4",
     "ts-codec": "^1.3.0",
     "uri-js": "^4.4.1",
-    "uuid": "^11.1.0",
-    "@powersync/lib-services-framework": "0.9.2",
-    "@powersync/service-core": "1.20.4",
-    "@powersync/service-sync-rules": "0.34.1",
-    "@powersync/service-types": "0.15.0",
-    "@powersync/service-jsonbig": "0.17.12"
+    "uuid": "^14.0.0",
+    "@powersync/lib-services-framework": "0.9.4",
+    "@powersync/service-core": "1.21.0",
+    "@powersync/service-sync-rules": "0.36.0",
+    "@powersync/service-types": "0.15.2",
+    "@powersync/service-jsonbig": "0.17.13"
   },
   "devDependencies": {
     "@types/async": "^3.2.24",
     "@types/semver": "^7.7.1",
-    "@powersync/service-core-tests": "0.15.3",
-    "@powersync/service-module-mongodb-storage": "0.15.3",
-    "@powersync/service-module-postgres-storage": "0.13.3"
+    "@powersync/service-core-tests": "0.15.5",
+    "@powersync/service-module-mongodb-storage": "0.16.0",
+    "@powersync/service-module-postgres-storage": "0.14.0"
   },
   "scripts": {
     "build": "tsc -b",

package/src/api/MySQLRouteAPIAdapter.ts

@@ -5,8 +5,8 @@ import * as service_types from '@powersync/service-types';
 import mysql from 'mysql2/promise';
 import * as common from '../common/common-index.js';
 import { toExpressionTypeFromMySQLType } from '../common/common-index.js';
-import * as mysql_utils from '../utils/mysql-utils.js';
 import * as types from '../types/types.js';
+import * as mysql_utils from '../utils/mysql-utils.js';
 
 type SchemaResult = {
   schema_name: string;

package/src/common/common-index.ts

@@ -1,5 +1,5 @@
 export * from './check-source-configuration.js';
-export * from './schema-utils.js';
 export * from './mysql-to-sqlite.js';
 export * from './read-executed-gtid.js';
 export * from './ReplicatedGTID.js';
+export * from './schema-utils.js';

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

@@ -1,9 +1,9 @@
+import { ColumnDefinition, TableMapEntry } from '@powersync/mysql-zongji';
+import { ColumnDescriptor } from '@powersync/service-core';
+import { JSONBig, JsonContainer } from '@powersync/service-jsonbig';
 import * as sync_rules from '@powersync/service-sync-rules';
 import { ExpressionType } from '@powersync/service-sync-rules';
-import { ColumnDescriptor } from '@powersync/service-core';
 import mysql from 'mysql2';
-import { JSONBig, JsonContainer } from '@powersync/service-jsonbig';
-import { ColumnDefinition, TableMapEntry } from '@powersync/mysql-zongji';
 
 export enum ADDITIONAL_MYSQL_TYPES {
   DATETIME2 = 18,

package/src/common/schema-utils.ts

@@ -1,7 +1,7 @@
-import mysqlPromise from 'mysql2/promise';
-import * as mysql_utils from '../utils/mysql-utils.js';
 import { ColumnDescriptor } from '@powersync/service-core';
 import { TablePattern } from '@powersync/service-sync-rules';
+import mysqlPromise from 'mysql2/promise';
+import * as mysql_utils from '../utils/mysql-utils.js';
 
 export interface GetColumnsOptions {
   connection: mysqlPromise.Connection;

package/src/module/MySQLModule.ts

@@ -8,13 +8,13 @@ import {
 } from '@powersync/service-core';
 
 import { MySQLRouteAPIAdapter } from '../api/MySQLRouteAPIAdapter.js';
+import { checkSourceConfiguration } from '../common/check-source-configuration.js';
 import { BinLogReplicator } from '../replication/BinLogReplicator.js';
+import { MySQLConnectionManager } from '../replication/MySQLConnectionManager.js';
+import { MySQLConnectionManagerFactory } from '../replication/MySQLConnectionManagerFactory.js';
 import { MySQLErrorRateLimiter } from '../replication/MySQLErrorRateLimiter.js';
 import * as types from '../types/types.js';
-import { MySQLConnectionManagerFactory } from '../replication/MySQLConnectionManagerFactory.js';
 import { MySQLConnectionConfig } from '../types/types.js';
-import { checkSourceConfiguration } from '../common/check-source-configuration.js';
-import { MySQLConnectionManager } from '../replication/MySQLConnectionManager.js';
 
 export class MySQLModule extends replication.ReplicationModule<types.MySQLConnectionConfig> {
   constructor() {

package/src/replication/BinLogReplicationJob.ts

@@ -1,4 +1,4 @@
-import { container, logger as defaultLogger } from '@powersync/lib-services-framework';
+import { container } from '@powersync/lib-services-framework';
 import { POWERSYNC_VERSION, replication } from '@powersync/service-core';
 import { BinLogStream } from './BinLogStream.js';
 import { MySQLConnectionManagerFactory } from './MySQLConnectionManagerFactory.js';
@@ -13,7 +13,7 @@ export class BinLogReplicationJob extends replication.AbstractReplicationJob {
 
   constructor(options: BinLogReplicationJobOptions) {
     super(options);
-    this.logger = defaultLogger.child({ prefix: `[powersync_${this.options.storage.group_id}] ` });
+    this.logger = options.storage.logger;
     this.connectionFactory = options.connectionFactory;
   }
 

package/src/replication/BinLogReplicator.ts

@@ -1,7 +1,7 @@
 import { replication, storage } from '@powersync/service-core';
+import { MySQLModule } from '../module/MySQLModule.js';
 import { BinLogReplicationJob } from './BinLogReplicationJob.js';
 import { MySQLConnectionManagerFactory } from './MySQLConnectionManagerFactory.js';
-import { MySQLModule } from '../module/MySQLModule.js';
 
 export interface BinLogReplicatorOptions extends replication.AbstractReplicatorOptions {
   connectionFactory: MySQLConnectionManagerFactory;

package/src/replication/BinLogStream.ts

@@ -139,7 +139,7 @@ export class BinLogStream {
     // Snapshot if:
     // 1. Snapshot is requested (false for initial snapshot, since that process handles it elsewhere)
     // 2. Snapshot is not done yet, AND:
-    // 3. The table is used in sync rules.
+    // 3. The table is used in sync config.
     const shouldSnapshot = snapshot && !result.table.snapshotComplete && result.table.syncAny;
 
     if (shouldSnapshot) {
@@ -291,7 +291,7 @@ export class BinLogStream {
     }
 
     if (lastOp != null) {
-      // Populate the cache _after_ initial replication, but _before_ we switch to this sync rules.
+      // Populate the cache _after_ initial replication, but _before_ we switch to this replication stream.
       await this.storage.populatePersistentChecksumCache({
         // No checkpoint yet, but we do have the opId.
         maxOpId: lastOp,
@@ -504,7 +504,7 @@ export class BinLogStream {
         await batch.drop([fromTable]);
         this.tableCache.delete(fromTableId);
       }
-      // The new table matched a table in the sync rules
+      // The new table matched a table in the sync config
       if (change.newTable) {
         await this.handleCreateOrUpdateTable(batch, change.newTable!, change.schema);
       }
@@ -577,7 +577,7 @@ export class BinLogStream {
 
     let table = this.tableCache.get(tableId);
     if (table == null) {
-      // This is an insert for a new table that matches a table in the sync rules
+      // This is an insert for a new table that matches a table in the sync config
       // We need to create the table in the storage and cache it.
       table = await this.handleCreateOrUpdateTable(batch, msg.tableEntry.tableName, msg.tableEntry.parentSchema);
     }

package/src/replication/MySQLConnectionManager.ts

@@ -1,9 +1,9 @@
-import { NormalizedMySQLConnectionConfig } from '../types/types.js';
-import mysqlPromise from 'mysql2/promise';
-import mysql, { FieldPacket, RowDataPacket } from 'mysql2';
-import * as mysql_utils from '../utils/mysql-utils.js';
 import { BaseObserver, logger } from '@powersync/lib-services-framework';
 import { ZongJi } from '@powersync/mysql-zongji';
+import mysql, { FieldPacket, RowDataPacket } from 'mysql2';
+import mysqlPromise from 'mysql2/promise';
+import { NormalizedMySQLConnectionConfig } from '../types/types.js';
+import * as mysql_utils from '../utils/mysql-utils.js';
 
 export interface MySQLConnectionManagerListener {
   onEnded(): void;

package/src/replication/MySQLConnectionManagerFactory.ts

@@ -1,7 +1,7 @@
 import { logger } from '@powersync/lib-services-framework';
 import mysql from 'mysql2/promise';
-import { MySQLConnectionManager } from './MySQLConnectionManager.js';
 import { ResolvedConnectionConfig } from '../types/types.js';
+import { MySQLConnectionManager } from './MySQLConnectionManager.js';
 
 export class MySQLConnectionManagerFactory {
   private readonly connectionManagers = new Set<MySQLConnectionManager>();

package/src/replication/zongji/BinLogListener.ts

@@ -1,10 +1,7 @@
-import * as common from '../../common/common-index.js';
-import async from 'async';
-import { BinLogEvent, BinLogQueryEvent, StartOptions, TableMapEntry, ZongJi } from '@powersync/mysql-zongji';
-import * as zongji_utils from './zongji-utils.js';
 import { Logger, logger as defaultLogger } from '@powersync/lib-services-framework';
-import { MySQLConnectionManager } from '../MySQLConnectionManager.js';
-import timers from 'timers/promises';
+import { BinLogEvent, BinLogQueryEvent, StartOptions, TableMapEntry, ZongJi } from '@powersync/mysql-zongji';
+import { TablePattern } from '@powersync/service-sync-rules';
+import async from 'async';
 import pkg, {
   AST,
   BaseFrom,
@@ -13,6 +10,8 @@ import pkg, {
   RenameStatement,
   TruncateStatement
 } from 'node-sql-parser';
+import timers from 'timers/promises';
+import * as common from '../../common/common-index.js';
 import {
   isAlterTable,
   isColumnExpression,
@@ -25,7 +24,8 @@ import {
   isTruncate,
   matchedSchemaChangeQuery
 } from '../../utils/parser-utils.js';
-import { TablePattern } from '@powersync/service-sync-rules';
+import { MySQLConnectionManager } from '../MySQLConnectionManager.js';
+import * as zongji_utils from './zongji-utils.js';
 
 const { Parser } = pkg;
 
@@ -445,8 +445,8 @@ export class BinLogListener {
     } catch (error) {
       if (matchedSchemaChangeQuery(query, Object.values(this.databaseFilter))) {
         this.logger.warn(
-          `Failed to parse query: [${query}]. 
-      Please review for the schema changes and manually redeploy the sync rules if required.`
+          `Failed to parse query: [${query}].
+Please review for the schema changes and manually redeploy the sync config if required.`
         );
       }
       return [];
@@ -537,7 +537,7 @@ export class BinLogListener {
   }
 
   private createDatabaseFilter(sourceTables: TablePattern[]): { [schema: string]: (table: string) => boolean } {
-    // Group sync rule tables by schema
+    // Group sync config tables by schema
     const schemaMap = new Map<string, TablePattern[]>();
     for (const table of sourceTables) {
       if (!schemaMap.has(table.schema)) {

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;
@@ -63,7 +63,7 @@ export function createPool(config: types.NormalizedMySQLConnectionConfig, option
 }
 
 /**
- *  Return a random server id for a given sync rule id.
+ *  Return a random server id for a given replication stream id.
  *  Expected format is: <syncRuleId>00<random number>
  *  The max value for server id in MySQL is 2^32 - 1.
  *  We use the GTID format to keep track of our position in the binlog, no state is kept by the MySQL server, therefore

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
@@ -82,7 +82,7 @@ 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;
@@ -93,7 +93,7 @@ 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;
@@ -104,7 +104,7 @@ export class BinlogStreamTestContext {
 
   private getSyncRulesContent(): storage.PersistedSyncRulesContent {
     if (this.syncRulesContent == null) {
-      throw new Error('Sync rules not configured - call updateSyncRules() first');
+      throw new Error('Sync config not configured - call updateSyncRules() first');
     }
     return this.syncRulesContent;
   }
@@ -206,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/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);

package/test/tsconfig.json

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