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

migration script to camel case

Browse Source
This commit is contained in:
azivner
2018-01-28 20:52:05 -05:00
parent c558b7c506
commit 75878c80a8
14 changed files with 258 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
services/sql.js
View File

@@ -226,7 +226,14 @@ async function doInTransaction(func) {
}
async function isDbUpToDate() {
const dbVersion = parseInt(await getFirstValue("SELECT value FROM options WHERE name = 'db_version'"));
let dbVersion;
try {
dbVersion = parseInt(await getFirstValue("SELECT value FROM options WHERE name = 'db_version'"));
}
catch (e) {
dbVersion = parseInt(await getFirstValue("SELECT opt_value FROM options WHERE opt_name = 'db_version'"));
}
const upToDate = dbVersion >= app_info.db_version;
@@ -238,7 +245,14 @@ async function isDbUpToDate() {
}
async function isUserInitialized() {
const username = await getFirstValue("SELECT value FROM options WHERE name = 'username'");
let username;
try {
username = await getFirstValue("SELECT value FROM options WHERE name = 'username'");
}
catch (e) {
username = await getFirstValue("SELECT opt_value FROM options WHERE opt_name = 'username'");
}
return !!username;
}