Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-02 03:16:11 +01:00
Code Issues Packages Projects Releases Activity

sync of options

Browse Source
This commit is contained in:
azivner
2017-11-02 20:48:02 -04:00
parent 40e27cd6f7
commit c3d776ae13
16 changed files with 142 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/migration.js
View File

@@ -1,5 +1,6 @@
const backup = require('./backup');
const sql = require('./sql');
const options = require('./options');
const fs = require('fs-extra');
const log = require('./log');
@@ -12,7 +13,7 @@ async function migrate() {
// backup before attempting migration
await backup.backupNow();
const currentDbVersion = parseInt(await sql.getOption('db_version'));
const currentDbVersion = parseInt(await options.getOption('db_version'));
fs.readdirSync(MIGRATIONS_DIR).forEach(file => {
const match = file.match(/([0-9]{4})__([a-zA-Z0-9_ ]+)\.sql/);
@@ -45,7 +46,7 @@ async function migrate() {
await sql.doInTransaction(async () => {
await sql.executeScript(migrationSql);
await sql.setOption("db_version", mig.dbVersion);
await options.setOption("db_version", mig.dbVersion);
});
log.info("Migration to version " + mig.dbVersion + " has been successful.");
@@ -66,7 +67,7 @@ async function migrate() {
}
async function isDbUpToDate() {
const dbVersion = parseInt(await sql.getOption('db_version'));
const dbVersion = parseInt(await options.getOption('db_version'));
return dbVersion >= APP_DB_VERSION;
}