From 2487cf1ae8cb55e78b3d8da595badcedf901c397 Mon Sep 17 00:00:00 2001
From: zzstoatzz <thrast36@gmail.com>
Date: Thu, 18 Jun 2026 10:38:06 -0500
Subject: [PATCH] Clean up sync event migrations

---
 src/storage/store.zig | 42 ++++++++++++++----------------------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/storage/store.zig b/src/storage/store.zig
index bfc5270..5bd4467 100644
--- a/src/storage/store.zig
+++ b/src/storage/store.zig
@@ -3655,16 +3655,20 @@ fn migrate() !void {
 }
 
 fn migratePermissionedDataTables() !void {
+    try ensureMigrationTable();
+    try migratePermissionedSpacesOwnerFk();
+    try migratePermissionedSpaceActorState();
+    try migratePermissionedRecordOplogRepo();
+    try migratePermissionedDropMemberLists();
+}
+
+fn ensureMigrationTable() !void {
     try conn.execNoArgs(
         \\CREATE TABLE IF NOT EXISTS zds_migrations (
         \\  name TEXT PRIMARY KEY,
         \\  applied_at INTEGER NOT NULL DEFAULT (unixepoch())
         \\)
     );
-    try migratePermissionedSpacesOwnerFk();
-    try migratePermissionedSpaceActorState();
-    try migratePermissionedRecordOplogRepo();
-    try migratePermissionedDropMemberLists();
 }
 
 fn migrationApplied(name: []const u8) !bool {
@@ -3772,17 +3776,8 @@ fn migratePermissionedDropMemberLists() !void {
 }
 
 fn migrateSeqEventsSync11() !void {
-    try conn.execNoArgs(
-        \\CREATE TABLE IF NOT EXISTS zds_migrations (
-        \\  name TEXT PRIMARY KEY,
-        \\  applied_at INTEGER NOT NULL DEFAULT (unixepoch())
-        \\)
-    );
-    const row = try conn.row("SELECT 1 FROM zds_migrations WHERE name = 'sync11-seq-events'", .{});
-    if (row != null) {
-        defer row.?.deinit();
-        return;
-    }
+    const name = "sync11-seq-events";
+    if (try migrationApplied(name)) return;
 
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
@@ -3793,22 +3788,13 @@ fn migrateSeqEventsSync11() !void {
     try conn.exclusiveTransaction();
     errdefer conn.rollback();
     try rebuildSeqEventsSync11Locked(allocator);
-    try conn.exec("INSERT INTO zds_migrations (name) VALUES (?)", .{"sync11-seq-events"});
+    try markMigrationApplied(name);
     try conn.commit();
 }
 
 fn migrateSeqEventsSinceRev() !void {
-    try conn.execNoArgs(
-        \\CREATE TABLE IF NOT EXISTS zds_migrations (
-        \\  name TEXT PRIMARY KEY,
-        \\  applied_at INTEGER NOT NULL DEFAULT (unixepoch())
-        \\)
-    );
-    const row = try conn.row("SELECT 1 FROM zds_migrations WHERE name = 'sync-since-rev-events'", .{});
-    if (row != null) {
-        defer row.?.deinit();
-        return;
-    }
+    const name = "sync-since-rev-events";
+    if (try migrationApplied(name)) return;
 
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
@@ -3819,7 +3805,7 @@ fn migrateSeqEventsSinceRev() !void {
     try conn.exclusiveTransaction();
     errdefer conn.rollback();
     try rebuildSeqEventsSync11Locked(allocator);
-    try conn.exec("INSERT INTO zds_migrations (name) VALUES (?)", .{"sync-since-rev-events"});
+    try markMigrationApplied(name);
     try conn.commit();
 }
 
-- 
2.51.2