Skip to content

Commit d93bf1d

Browse files
committed
Fix watch test + potential deathloop
1 parent 9d101bd commit d93bf1d

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

PowerSync/PowerSync.Common/Client/PowerSyncDatabase.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@ IAsyncEnumerable<DBAdapterEvent> initialListener
882882
powersyncTables,
883883
currentListener,
884884
currentRestartCts.Token,
885-
isRestart || options?.TriggerImmediately == true
885+
isRestart || (options?.TriggerImmediately == true)
886886
).GetAsyncEnumerator(currentRestartCts.Token);
887887

888888
// Continually wait for either OnChange or SchemaChanged to fire
@@ -972,6 +972,8 @@ private async IAsyncEnumerable<WatchOnChangeEvent> OnRawTableChange(
972972
GetTablesFromNotification(e.TablesUpdated, changedTables);
973973
changedTables.IntersectWith(watchedTables);
974974

975+
if (changedTables.Count == 0) continue;
976+
975977
yield return new WatchOnChangeEvent { ChangedTables = [.. changedTables] };
976978
}
977979
}

PowerSync/PowerSync.Common/Client/Sync/Stream/StreamingSyncTypes.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public class RequestStreamSubscription
9797
[JsonProperty("parameters")]
9898
public Dictionary<string, object> Parameters { get; set; } = new();
9999

100-
[JsonProperty("override_priority", NullValueHandling = NullValueHandling.Ignore)]
100+
[JsonProperty("override_priority")]
101101
public int? OverridePriority { get; set; }
102102

103103
}

Tests/PowerSync/PowerSync.Common.Tests/Client/PowerSyncDatabaseTests.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,13 +706,11 @@ public async Task WatchSchemaResetTest()
706706
{
707707
await foreach (var result in listener)
708708
{
709-
if (result.Length > 0)
710-
{
711-
lastCount = result[0].count;
712-
}
709+
lastCount = result[0].count;
713710
sem.Release();
714711
}
715-
});
712+
}, testCts.Token);
713+
Assert.False(await sem.WaitAsync(200));
716714

717715
var resolved = await db.GetSourceTables(QUERY, null);
718716
Assert.Single(resolved);

0 commit comments

Comments
 (0)