core: fix notes with no conflict marked as conflicted

streetwriters · May 17, 2024 · 43f4669 · 43f4669
1 parent 3b04925
commit 43f4669
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/packages/core/src/api/sync/index.ts b/packages/core/src/api/sync/index.ts
@@ -251,7 +251,7 @@ class Sync {
           .selectFrom("content")
           .select("noteId as id")
           .where("conflicted", "is not", null)
-          .where("conflicted", "is not", false)
+          .where("conflicted", "!=", false)
           .$castTo<string | null>()
       )
       .set({ conflicted: true })

diff --git a/packages/core/src/database/migrations.ts b/packages/core/src/database/migrations.ts
@@ -289,6 +289,26 @@ export class NNMigrationProvider implements MigrationProvider {
         async up(db) {
           await rebuildSearchIndex(db);
         }
+      },
+      "3": {
+        async up(db) {
+          await db
+            .updateTable("notes")
+            .where("id", "in", (eb) =>
+              eb
+                .selectFrom("content")
+                .select("noteId as id")
+                .where((eb) =>
+                  eb.or([
+                    eb("conflicted", "is", null),
+                    eb("conflicted", "==", false)
+                  ])
+                )
+                .$castTo<string | null>()
+            )
+            .set({ conflicted: false })
+            .execute();
+        }
       }
     };
   }