tmp

Author: Chriztiaan

PowerSync/PowerSync.Common/Client/Sync/Bucket/SqliteBucketStorage.cs

@@ -40,7 +40,7 @@ public SqliteBucketStorage(IDBAdapter db, ILogger? logger = null)
         this.logger = logger ?? NullLogger.Instance; ;
         hasCompletedSync = false;
         pendingBucketDeletes = true;
-        tableNames = [];
+        tableNames = new HashSet<string>();
 
         updateCts = new CancellationTokenSource();
 
@@ -110,8 +110,10 @@ await db.WriteTransaction(async tx =>
             int count = 0;
             foreach (var b in batch.Buckets)
             {
+                var bucketJson = b.ToJSON();
+                var jsonData = $"{{\"buckets\":[{bucketJson}]}}";
                 var result = await tx.Execute("INSERT INTO powersync_operations(op, data) VALUES(?, ?)",
-                    ["save", JsonConvert.SerializeObject(new { buckets = new[] { JsonConvert.DeserializeObject(b.ToJSON()) } })]);
+                    ["save", jsonData]);
                 logger.LogDebug("saveSyncData {message}", JsonConvert.SerializeObject(result));
                 count += b.Data.Length;
             }
@@ -156,7 +158,7 @@ public async Task<SyncLocalDatabaseResult> SyncLocalDatabase(Checkpoint checkpoi
         if (!validation.CheckpointValid)
         {
             logger.LogError("Checksums failed for {failures}", JsonConvert.SerializeObject(validation.CheckpointFailures));
-            foreach (var failedBucket in validation.CheckpointFailures ?? [])
+            foreach (var failedBucket in validation.CheckpointFailures ?? new string[0])
             {
                 await DeleteBucket(failedBucket);
             }
@@ -249,7 +251,7 @@ public async Task<SyncLocalDatabaseResult> ValidateChecksums(
             {
                 CheckpointValid = false,
                 Ready = false,
-                CheckpointFailures = resultDetail?.FailedBuckets?.ToArray() ?? []
+                CheckpointFailures = resultDetail?.FailedBuckets?.ToArray() ?? new string[0]
             };
         }
     }

PowerSync/PowerSync.Common/Client/Sync/Bucket/SyncDataBucket.cs

@@ -19,7 +19,7 @@ public class SyncDataBucketJSON
     // public string? NextAfter { get; set; }
 
     [JsonProperty("data")]
-    public List<object> Data { get; set; } = [];
+    public List<object> Data { get; set; } = new List<object>();
 }
 
 public class SyncDataBucket(
@@ -37,7 +37,7 @@ public static SyncDataBucket FromRow(SyncDataBucketJSON row)
                 .Select(obj => JsonConvert.DeserializeObject<OplogEntryJSON>(JsonConvert.SerializeObject(obj))!) // Convert object to JSON string, then deserialize
                 .Select(OplogEntry.FromRow)
                 .ToArray()
-            : [];
+            : new OplogEntry[0];
 
         return new SyncDataBucket(
             row.Bucket,
@@ -48,9 +48,18 @@ public static SyncDataBucket FromRow(SyncDataBucketJSON row)
     public string ToJSON()
     {
         List<object> dataObjects = Data
-         .Select(entry => JsonConvert.DeserializeObject<object>(entry.ToJSON()))
-         .Where(obj => obj != null)
-         .ToList()!;
+         .Select(entry => new OplogEntryJSON
+         {
+             OpId = entry.OpId,
+             Op = entry.Op.ToJSON(),
+             Checksum = entry.Checksum,
+             Data = entry.Data != null ? JsonConvert.SerializeObject(entry.Data) : null,
+             ObjectType = entry.ObjectType,
+             ObjectId = entry.ObjectId,
+             Subkey = entry.Subkey
+         })
+         .Cast<object>()
+         .ToList();
 
         var jsonObject = new SyncDataBucketJSON
         {