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

separate DB connection for each transaction (just for the record, will be reverted probably)

Browse Source
This commit is contained in:
azivner
2017-11-28 17:04:47 -05:00
parent 4d95eb0762
commit fd764f6163
21 changed files with 326 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/migration.js
View File

@@ -43,25 +43,25 @@ async function migrate() {
try {
log.info("Attempting migration to version " + mig.dbVersion);
await sql.doInTransaction(async () => {
await sql.doInTransaction(async db => {
if (mig.type === 'sql') {
const migrationSql = fs.readFileSync(MIGRATIONS_DIR + "/" + mig.file).toString('utf8');
console.log("Migration with SQL script: " + migrationSql);
await sql.executeScript(migrationSql);
await sql.executeScript(db, migrationSql);
}
else if (mig.type === 'js') {
console.log("Migration with JS module");
const migrationModule = require("../" + MIGRATIONS_DIR + "/" + mig.file);
await migrationModule();
await migrationModule(db);
}
else {
throw new Error("Unknown migration type " + mig.type);
}
await options.setOption("db_version", mig.dbVersion);
await options.setOption(db, "db_version", mig.dbVersion);
});
log.info("Migration to version " + mig.dbVersion + " has been successful.");