Revert unrelated changes

Author: simolus3

modules/module-mongodb-storage/src/storage/implementation/MongoBucketBatch.ts

@@ -45,7 +45,6 @@ const replicationMutex = new utils.Mutex();
 export interface MongoBucketBatchOptions {
   db: PowerSyncMongo;
   syncRules: SqlSyncRules;
-  syncRulesId: string;
   groupId: number;
   slotName: string;
   lastCheckpointLsn: string | null;
@@ -73,7 +72,6 @@ export class MongoBucketBatch
   public readonly db: PowerSyncMongo;
   public readonly session: mongo.ClientSession;
   private readonly sync_rules: SqlSyncRules;
-  private readonly syncRulesId: string;
 
   private readonly group_id: number;
 
@@ -129,7 +127,6 @@ export class MongoBucketBatch
     this.session = this.client.startSession();
     this.slot_name = options.slotName;
     this.sync_rules = options.syncRules;
-    this.syncRulesId = options.syncRulesId;
     this.storeCurrentData = options.storeCurrentData;
     this.skipExistingRows = options.skipExistingRows;
     this.markRecordUnavailable = options.markRecordUnavailable;
@@ -465,7 +462,7 @@ export class MongoBucketBatch
         const { results: evaluated, errors: syncErrors } = this.sync_rules.evaluateRowWithErrors({
           record: after,
           sourceTable,
-          bucketIdTransformer: SqlSyncRules.versionedBucketIdTransformer(this.syncRulesId)
+          bucketIdTransformer: SqlSyncRules.versionedBucketIdTransformer(`${this.group_id}`)
         });
 
         for (let error of syncErrors) {

modules/module-mongodb-storage/src/storage/implementation/MongoSyncBucketStorage.ts

@@ -154,7 +154,6 @@ export class MongoSyncBucketStorage
       logger: options.logger,
       db: this.db,
       syncRules: this.sync_rules.parsed(options).sync_rules,
-      syncRulesId: `${this.sync_rules.id}`,
       groupId: this.group_id,
       slotName: this.slot_name,
       lastCheckpointLsn: checkpoint_lsn,

modules/module-mongodb/src/replication/MongoRelation.ts

@@ -1,13 +1,16 @@
 import { mongo } from '@powersync/lib-service-mongodb';
 import { storage } from '@powersync/service-core';
-import { JsonContainer } from '@powersync/service-jsonbig';
+import { JSONBig, JsonContainer } from '@powersync/service-jsonbig';
 import {
   CompatibilityContext,
   CustomArray,
   CustomObject,
   CustomSqliteValue,
+  DatabaseInputValue,
   SqliteInputRow,
   SqliteInputValue,
+  SqliteRow,
+  SqliteValue,
   DateTimeValue
 } from '@powersync/service-sync-rules';
 

modules/module-mongodb/test/src/mongo_test.test.ts

@@ -4,8 +4,7 @@ import {
   CompatibilityContext,
   CompatibilityEdition,
   SqliteInputRow,
-  SqlSyncRules,
-  TimeValue
+  SqlSyncRules
 } from '@powersync/service-sync-rules';
 import { describe, expect, test } from 'vitest';
 
@@ -168,7 +167,7 @@ describe('mongo data types', () => {
 
     expect(sqliteValue[2]).toMatchObject({
       _id: 3n,
-      date: new TimeValue('2023-03-06 13:47:00.000Z', '2023-03-06T13:47:00.000Z')
+      date: '2023-03-06 13:47:00.000Z'
     });
 
     expect(sqliteValue[3]).toMatchObject({
@@ -222,7 +221,7 @@ describe('mongo data types', () => {
 
     expect(sqliteValue[2]).toMatchObject({
       _id: 3n,
-      date: ['2023-03-06 13:47:00.000Z']
+      date: '["2023-03-06 13:47:00.000Z"]'
     });
 
     expect(sqliteValue[3]).toMatchObject({

modules/module-postgres-storage/src/storage/PostgresSyncRulesStorage.ts

@@ -330,7 +330,6 @@ export class PostgresSyncRulesStorage
       logger: options.logger ?? framework.logger,
       db: this.db,
       sync_rules: this.sync_rules.parsed(options).sync_rules,
-      syncRulesId: `${this.sync_rules.id}`,
       group_id: this.group_id,
       slot_name: this.slot_name,
       last_checkpoint_lsn: checkpoint_lsn,

modules/module-postgres-storage/src/storage/batch/PostgresBucketBatch.ts

@@ -25,7 +25,6 @@ export interface PostgresBucketBatchOptions {
   logger: Logger;
   db: lib_postgres.DatabaseClient;
   sync_rules: sync_rules.SqlSyncRules;
-  syncRulesId: string;
   group_id: number;
   slot_name: string;
   last_checkpoint_lsn: string | null;
@@ -74,7 +73,6 @@ export class PostgresBucketBatch
 
   protected write_checkpoint_batch: storage.CustomWriteCheckpointOptions[];
   protected readonly sync_rules: sync_rules.SqlSyncRules;
-  private readonly syncRulesId: string;
   protected batch: OperationBatch | null;
   private lastWaitingLogThrottled = 0;
   private markRecordUnavailable: BucketStorageMarkRecordUnavailable | undefined;
@@ -90,7 +88,6 @@ export class PostgresBucketBatch
     this.resumeFromLsn = options.resumeFromLsn;
     this.write_checkpoint_batch = [];
     this.sync_rules = options.sync_rules;
-    this.syncRulesId = options.syncRulesId;
     this.markRecordUnavailable = options.markRecordUnavailable;
     this.batch = null;
     this.persisted_op = null;
@@ -829,7 +826,7 @@ export class PostgresBucketBatch
         const { results: evaluated, errors: syncErrors } = this.sync_rules.evaluateRowWithErrors({
           record: after,
           sourceTable,
-          bucketIdTransformer: sync_rules.SqlSyncRules.versionedBucketIdTransformer(this.syncRulesId)
+          bucketIdTransformer: sync_rules.SqlSyncRules.versionedBucketIdTransformer(`${this.group_id}`)
         });
 
         for (const error of syncErrors) {

packages/jpgwire/src/pgwire_types.ts

@@ -182,14 +182,7 @@ export class PgType {
           const decoded = this.decode(unescaped, elemTypeOid);
           stack[0].push(decoded);
         }
-
-        if (ch == 0x7d /*}*/) {
-          const entry = stack.shift();
-          result = entry;
-        } else {
-          result = false;
-        }
-
+        result = ch == 0x7d /*}*/ && stack.shift();
         elStart = i + 1; // TODO dry
       }
     }