From 63aa2c6b27f458ed8851ff5ed2b7737e97cedfca Mon Sep 17 00:00:00 2001 From: contributor Date: Sat, 23 May 2026 12:46:06 +0300 Subject: [PATCH 1/2] better ide navigation and encapsulation for max migration version --- packages/trilium-core/src/migrations/migrations.ts | 9 ++++----- packages/trilium-core/src/services/app_info.ts | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/trilium-core/src/migrations/migrations.ts b/packages/trilium-core/src/migrations/migrations.ts index 0c9dd4e8d1a..237d5ed307b 100644 --- a/packages/trilium-core/src/migrations/migrations.ts +++ b/packages/trilium-core/src/migrations/migrations.ts @@ -3,9 +3,12 @@ * * Contains all the migrations that are run on the database. */ +export function getMaxMigrationVersion() { + return MIGRATIONS[0].version; +} // Migrations should be kept in descending order, so the latest migration is first. -const MIGRATIONS: (SqlMigration | JsMigration)[] = [ +export const MIGRATIONS: (SqlMigration | JsMigration)[] = [ // Add description column to revisions table for manual revision comments { version: 238, @@ -351,10 +354,6 @@ const MIGRATIONS: (SqlMigration | JsMigration)[] = [ } ]; -export default MIGRATIONS; - -export const MAX_MIGRATION_VERSION = MIGRATIONS[0].version; - interface Migration { version: number; /** If true, errors during this migration are logged but do not halt the migration process. Useful for migrations that may have already been applied (e.g. adding a column that already exists). */ diff --git a/packages/trilium-core/src/services/app_info.ts b/packages/trilium-core/src/services/app_info.ts index a860dbe81f5..70d5251f19e 100644 --- a/packages/trilium-core/src/services/app_info.ts +++ b/packages/trilium-core/src/services/app_info.ts @@ -1,14 +1,14 @@ import build from "./build.js"; import packageJson from "../../package.json" with { type: "json" }; import { AppInfo } from "@triliumnext/commons"; -import { MAX_MIGRATION_VERSION } from "../migrations/migrations.js"; +import { getMaxMigrationVersion } from "../migrations/migrations.js"; const SYNC_VERSION = 39; const CLIPPER_PROTOCOL_VERSION = "1.0"; const appInfo: AppInfo = { appVersion: packageJson.version, - dbVersion: MAX_MIGRATION_VERSION, + dbVersion: getMaxMigrationVersion(), syncVersion: SYNC_VERSION, buildDate: build.buildDate, buildRevision: build.buildRevision, From 14f79bc9fe5e7bb10283359c7c9ac4aa10d9af0e Mon Sep 17 00:00:00 2001 From: contributor Date: Wed, 27 May 2026 17:21:59 +0300 Subject: [PATCH 2/2] update migrations import statements --- packages/trilium-core/src/migrations/migrations.spec.ts | 2 +- packages/trilium-core/src/services/migration.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/trilium-core/src/migrations/migrations.spec.ts b/packages/trilium-core/src/migrations/migrations.spec.ts index 98a6924ce39..d458e8366fc 100644 --- a/packages/trilium-core/src/migrations/migrations.spec.ts +++ b/packages/trilium-core/src/migrations/migrations.spec.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from "vitest"; -import MIGRATIONS from "./migrations.js"; +import { MIGRATIONS } from "./migrations.js"; describe("migrations", () => { it("should have unique version numbers", () => { diff --git a/packages/trilium-core/src/services/migration.ts b/packages/trilium-core/src/services/migration.ts index 94b27db3587..1731786a084 100644 --- a/packages/trilium-core/src/services/migration.ts +++ b/packages/trilium-core/src/services/migration.ts @@ -5,7 +5,7 @@ import { getPlatform } from "./platform.js"; import appInfo from "./app_info.js"; import * as cls from "./context.js"; import { t } from "i18next"; -import MIGRATIONS from "../migrations/migrations.js"; +import { MIGRATIONS } from "../migrations/migrations.js"; interface MigrationInfo { dbVersion: number;