Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

core: fix db migration

Abdullah Atta2964e7a8f0f7
diff --git a/packages/core/src/database/migrations.ts b/packages/core/src/database/migrations.ts
index 67c22285c..5443b67b0 100644
--- a/packages/core/src/database/migrations.ts
+++ b/packages/core/src/database/migrations.ts
@@ -21,6 +21,7 @@ import {
ColumnBuilderCallback,
CreateTableBuilder,
ExpressionBuilder,
+ Kysely,
Migration,
MigrationProvider,
sql
@@ -360,33 +361,6 @@ export class NNMigrationProvider implements MigrationProvider {
"7": {
async up() {}
},
- "8": {
- async up(db) {
- await db.transaction().execute(async (tx) => {
- await tx.schema.dropTable("content_fts").execute();
- await tx.schema.dropTable("notes_fts").execute();
-
- await createFTS5Table(
- "notes_fts",
- [{ name: "id" }, { name: "title" }],
- {
- contentTable: "notes",
- tokenizer: ["porter", "better_trigram", "remove_diacritics 1"]
- }
- ).execute(tx);
-
- await createFTS5Table(
- "content_fts",
- [{ name: "id" }, { name: "noteId" }, { name: "data" }],
- {
- contentTable: "content",
- tokenizer: ["porter", "better_trigram", "remove_diacritics 1"]
- }
- ).execute(tx);
- });
- await rebuildSearchIndex(db);
- }
- },
"8": {
async up(db) {
await db.schema
@@ -402,6 +376,11 @@ export class NNMigrationProvider implements MigrationProvider {
.addColumn("archived", "boolean")
.execute();
}
+ },
+ "10": {
+ async up(db) {
+ await runFTSTablesMigrations(db);
+ }
}
};
}
@@ -464,3 +443,25 @@ function createFTS5Table(
return sql`CREATE VIRTUAL TABLE ${sql.raw(name)} USING fts5(${args})`;
}
+
+async function runFTSTablesMigrations(db: Kysely<any>) {
+ await db.transaction().execute(async (tx) => {
+ await tx.schema.dropTable("content_fts").execute();
+ await tx.schema.dropTable("notes_fts").execute();
+
+ await createFTS5Table("notes_fts", [{ name: "id" }, { name: "title" }], {
+ contentTable: "notes",
+ tokenizer: ["porter", "better_trigram", "remove_diacritics 1"]
+ }).execute(tx);
+
+ await createFTS5Table(
+ "content_fts",
+ [{ name: "id" }, { name: "noteId" }, { name: "data" }],
+ {
+ contentTable: "content",
+ tokenizer: ["porter", "better_trigram", "remove_diacritics 1"]
+ }
+ ).execute(tx);
+ });
+ await rebuildSearchIndex(db);
+}