@powersync/service-module-mysql 0.0.0-dev-20250317122913 → 0.0.0-dev-20250326092547

package/test/src/BinLogStream.test.ts

@@ -1,10 +1,11 @@
-import { Metrics, storage } from '@powersync/service-core';
-import { putOp, removeOp } from '@powersync/service-core-tests';
+import { storage } from '@powersync/service-core';
+import { METRICS_HELPER, putOp, removeOp } from '@powersync/service-core-tests';
 import { v4 as uuid } from 'uuid';
 import { describe, expect, test } from 'vitest';
 import { BinlogStreamTestContext } from './BinlogStreamUtils.js';
 import { env } from './env.js';
 import { INITIALIZED_MONGO_STORAGE_FACTORY, INITIALIZED_POSTGRES_STORAGE_FACTORY } from './util.js';
+import { ReplicationMetric } from '@powersync/service-types';
 
 const BASIC_SYNC_RULES = `
 bucket_definitions:
@@ -35,9 +36,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
 
     await context.replicateSnapshot();
 
-    const startRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const startTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const startRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const startTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
 
     context.startStreaming();
     const testId = uuid();
@@ -47,9 +47,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
     const data = await context.getBucketData('global[]');
 
     expect(data).toMatchObject([putOp('test_data', { id: testId, description: 'test1', num: 1152921504606846976n })]);
-    const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const endTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const endRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const endTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
     expect(endRowCount - startRowCount).toEqual(1);
     expect(endTxCount - startTxCount).toEqual(1);
   });
@@ -68,9 +67,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
 
     await context.replicateSnapshot();
 
-    const startRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const startTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const startRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const startTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
 
     context.startStreaming();
 
@@ -80,9 +78,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
     const data = await context.getBucketData('global[]');
 
     expect(data).toMatchObject([putOp('test_DATA', { id: testId, description: 'test1' })]);
-    const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const endTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const endRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const endTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
     expect(endRowCount - startRowCount).toEqual(1);
     expect(endTxCount - startTxCount).toEqual(1);
   });
@@ -172,11 +169,15 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
     const testId = uuid();
     await connectionManager.query(`INSERT INTO test_data(id, description) VALUES('${testId}','test1')`);
 
+    const startRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+
     await context.replicateSnapshot();
     context.startStreaming();
 
+    const endRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
     const data = await context.getBucketData('global[]');
     expect(data).toMatchObject([putOp('test_data', { id: testId, description: 'test1' })]);
+    expect(endRowCount - startRowCount).toEqual(1);
   });
 
   test('snapshot with date values', async () => {
@@ -229,9 +230,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
 
     await context.replicateSnapshot();
 
-    const startRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const startTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const startRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const startTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
 
     context.startStreaming();
 
@@ -258,9 +258,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
         timestamp: '2023-03-06T15:47:00.000Z'
       })
     ]);
-    const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const endTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const endRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const endTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
     expect(endRowCount - startRowCount).toEqual(2);
     expect(endTxCount - startTxCount).toEqual(2);
   });
@@ -274,9 +273,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
 
     await context.replicateSnapshot();
 
-    const startRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const startTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const startRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const startTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
 
     context.startStreaming();
 
@@ -284,9 +282,8 @@ function defineBinlogStreamTests(factory: storage.TestStorageFactory) {
     const data = await context.getBucketData('global[]');
 
     expect(data).toMatchObject([]);
-    const endRowCount = (await Metrics.getInstance().getMetricValueForTests('powersync_rows_replicated_total')) ?? 0;
-    const endTxCount =
-      (await Metrics.getInstance().getMetricValueForTests('powersync_transactions_replicated_total')) ?? 0;
+    const endRowCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.ROWS_REPLICATED)) ?? 0;
+    const endTxCount = (await METRICS_HELPER.getMetricValueForTests(ReplicationMetric.TRANSACTIONS_REPLICATED)) ?? 0;
 
     // There was a transaction, but we should not replicate any actual data
     expect(endRowCount - startRowCount).toEqual(0);

package/test/src/BinlogStreamUtils.ts

@@ -4,6 +4,8 @@ import { MySQLConnectionManager } from '@module/replication/MySQLConnectionManag
 import { logger } from '@powersync/lib-services-framework';
 import {
   BucketStorageFactory,
+  createCoreReplicationMetrics,
+  initializeCoreReplicationMetrics,
   InternalOpId,
   OplogEntry,
   ProtocolOpId,
@@ -11,7 +13,7 @@ import {
   storage,
   SyncRulesBucketStorage
 } from '@powersync/service-core';
-import { test_utils } from '@powersync/service-core-tests';
+import { METRICS_HELPER, test_utils } from '@powersync/service-core-tests';
 import mysqlPromise from 'mysql2/promise';
 import { clearTestDb, TEST_CONNECTION_OPTIONS } from './util.js';
 
@@ -44,7 +46,10 @@ export class BinlogStreamTestContext {
   constructor(
     public factory: BucketStorageFactory,
     public connectionManager: MySQLConnectionManager
-  ) {}
+  ) {
+    createCoreReplicationMetrics(METRICS_HELPER.metricsEngine);
+    initializeCoreReplicationMetrics(METRICS_HELPER.metricsEngine);
+  }
 
   async dispose() {
     this.abortController.abort();
@@ -97,6 +102,7 @@ export class BinlogStreamTestContext {
     }
     const options: BinLogStreamOptions = {
       storage: this.storage,
+      metrics: METRICS_HELPER.metricsEngine,
       connections: this.connectionManager,
       abortSignal: this.abortController.signal
     };

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

@@ -40,6 +40,9 @@ describe('MySQL Data Types', () => {
 
     char_col CHAR(10),
     varchar_col VARCHAR(255),
+    varchar_binary_encoding_col VARCHAR(255) CHARACTER SET binary,
+    varchar_with_bin_collation_col VARCHAR(255) COLLATE utf8mb4_bin,
+    
     binary_col BINARY(16),
     varbinary_col VARBINARY(256),
     tinyblob_col TINYBLOB,
@@ -145,6 +148,8 @@ INSERT INTO test_data (
 INSERT INTO test_data (
     char_col,
     varchar_col,
+    varchar_binary_encoding_col,
+    varchar_with_bin_collation_col,
     binary_col,
     varbinary_col,
     tinyblob_col,
@@ -159,7 +164,9 @@ INSERT INTO test_data (
 ) VALUES (
     'CharData',               -- CHAR(10) with padding spaces
     'Variable character data',-- VARCHAR(255)
-    'ShortBin',        -- BINARY(16)
+    'Varchar with binary encoding', -- VARCHAR(255) with binary encoding
+    'Variable character data with bin collation', -- VARCHAR(255) with bin collation
+    'ShortBin',               -- BINARY(16)
     'VariableBinaryData',     -- VARBINARY(256)
     'TinyBlobData',           -- TINYBLOB
     'BlobData',               -- BLOB
@@ -177,6 +184,11 @@ INSERT INTO test_data (
     const expectedResult = {
       char_col: 'CharData',
       varchar_col: 'Variable character data',
+      varchar_binary_encoding_col: new Uint8Array([
+        86, 97, 114, 99, 104, 97, 114, 32, 119, 105, 116, 104, 32, 98, 105, 110, 97, 114, 121, 32, 101, 110, 99, 111,
+        100, 105, 110, 103
+      ]),
+      varchar_with_bin_collation_col: 'Variable character data with bin collation',
       binary_col: new Uint8Array([83, 104, 111, 114, 116, 66, 105, 110, 0, 0, 0, 0, 0, 0, 0, 0]), // Pad with 0
       varbinary_col: new Uint8Array([
         0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x69, 0x6e, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61

package/test/src/setup.ts

@@ -1,13 +1,12 @@
 import { container } from '@powersync/lib-services-framework';
-import { test_utils } from '@powersync/service-core-tests';
+import { METRICS_HELPER } from '@powersync/service-core-tests';
 import { beforeAll, beforeEach } from 'vitest';
 
 beforeAll(async () => {
   // Executes for every test file
   container.registerDefaults();
-  await test_utils.initMetrics();
 });
 
 beforeEach(async () => {
-  await test_utils.resetMetrics();
+  METRICS_HELPER.resetMetrics();
 });