Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-29 17:26:38 +01:00
Code Issues Packages Projects Releases Activity

distinguishing between when DB is just connected and when it's ready for queries (validated)

Browse Source
This commit is contained in:
azivner
2017-12-03 19:18:33 -05:00
parent 3a26054619
commit a3f57622ff
5 changed files with 52 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/sql.js
View File

@@ -2,13 +2,30 @@
const log = require('./log');
const dataDir = require('./data_dir');
const fs = require('fs');
const sqlite = require('sqlite');
async function createConnection() {
return await sqlite.open(dataDir.DOCUMENT_PATH, {Promise});
}
const dbReady = createConnection();
const dbConnected = createConnection();
const dbReady = new Promise((resolve, reject) => {
dbConnected.then(async db => {
const tableResults = await getResults("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'");
if (tableResults.length !== 1) {
console.log("No connection to initialized DB.");
process.exit(1);
}
resolve(db);
})
.catch(e => {
console.log("Error connecting to DB.", e);
process.exit(1);
});
});
async function insert(table_name, rec, replace = false) {
const keys = Object.keys(rec);
@@ -44,13 +61,10 @@ async function rollback() {
}
async function getSingleResult(query, params = []) {
const db = await dbReady;
return await wrap(async db => db.get(query, ...params));
}
async function getSingleResultOrNull(query, params = []) {
const db = await dbReady;
const all = await wrap(async db => db.all(query, ...params));
return all.length > 0 ? all[0] : null;
@@ -67,8 +81,6 @@ async function getSingleValue(query, params = []) {
}
async function getResults(query, params = []) {
const db = await dbReady;
return await wrap(async db => db.all(query, ...params));
}
@@ -106,7 +118,7 @@ async function executeScript(query) {
async function wrap(func) {
const thisError = new Error();
const db = await dbReady;
const db = await dbConnected;
try {
return await func(db);
@@ -157,20 +169,6 @@ async function doInTransaction(func) {
}
}
dbReady
.then(async () => {
const tableResults = await getResults("SELECT name FROM sqlite_master WHERE type='table' AND name='notes'");
if (tableResults.length !== 1) {
console.log("No connection to initialized DB.");
process.exit(1);
}
})
.catch(e => {
console.log("Error connecting to DB.", e);
process.exit(1);
});
module.exports = {
dbReady,
insert,