Present 'database error' dialog in more situations

pull/272/head
Scott Nonnenberg 6 years ago
parent 812f895e12
commit ca5132f712

@ -696,25 +696,25 @@ async function initialize({ configDir, key, messages }) {
filePath = path.join(dbDir, 'db.sqlite'); filePath = path.join(dbDir, 'db.sqlite');
const sqlInstance = await openDatabase(filePath); try {
const promisified = promisify(sqlInstance); const sqlInstance = await openDatabase(filePath);
const promisified = promisify(sqlInstance);
// promisified.on('trace', async statement => { // promisified.on('trace', async statement => {
// if (!db || statement.startsWith('--')) { // if (!db || statement.startsWith('--')) {
// console._log(statement); // console._log(statement);
// return; // return;
// } // }
// const data = await db.get(`EXPLAIN QUERY PLAN ${statement}`); // const data = await db.get(`EXPLAIN QUERY PLAN ${statement}`);
// console._log(`EXPLAIN QUERY PLAN ${statement}\n`, data && data.detail); // console._log(`EXPLAIN QUERY PLAN ${statement}\n`, data && data.detail);
// }); // });
await setupSQLCipher(promisified, { key }); await setupSQLCipher(promisified, { key });
await updateSchema(promisified); await updateSchema(promisified);
db = promisified; db = promisified;
// test database // test database
try {
await getMessageCount(); await getMessageCount();
} catch (error) { } catch (error) {
console.log('Database startup error:', error.stack); console.log('Database startup error:', error.stack);

Loading…
Cancel
Save