gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

server-esm: Handle migrations asynchronously

Browse Source
This commit is contained in:
Elian Doran 2024-07-18 23:36:49 +03:00
parent 3852753a89
commit 86808c07bd
No known key found for this signature in database
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/migration.ts
View File

@ -67,12 +67,12 @@ async function migrate() {
cls.setMigrationRunning(true); cls.setMigrationRunning(true);
sql.transactional(() => { sql.transactional(async () => {
for (const mig of migrations) { for (const mig of migrations) {
try { try {
log.info(`Attempting migration to version ${mig.dbVersion}`); log.info(`Attempting migration to version ${mig.dbVersion}`);
executeMigration(mig); await executeMigration(mig);
sql.execute(`UPDATE options sql.execute(`UPDATE options
SET value = ? SET value = ?
@ -96,7 +96,7 @@ async function migrate() {
} }
} }
function executeMigration(mig: MigrationInfo) { async function executeMigration(mig: MigrationInfo) {
if (mig.type === 'sql') { if (mig.type === 'sql') {
const migrationSql = fs.readFileSync(`${resourceDir.MIGRATIONS_DIR}/${mig.file}`).toString('utf8'); const migrationSql = fs.readFileSync(`${resourceDir.MIGRATIONS_DIR}/${mig.file}`).toString('utf8');
@ -106,7 +106,7 @@ function executeMigration(mig: MigrationInfo) {
} else if (mig.type === 'js') { } else if (mig.type === 'js') {
console.log("Migration with JS module"); console.log("Migration with JS module");
const migrationModule = require(`${resourceDir.MIGRATIONS_DIR}/${mig.file}`); const migrationModule = await import(`${resourceDir.MIGRATIONS_DIR}/${mig.file}`);
migrationModule(); migrationModule();
} else { } else {
throw new Error(`Unknown migration type '${mig.type}'`); throw new Error(`Unknown migration type '${mig.type}'`);