Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

removed support for old option schema of opt_name and opt_value

Browse Source
This commit is contained in:
azivner
2018-03-31 23:11:43 -04:00
parent 12439d8761
commit 87e415992c
2 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/options.js
View File

@@ -4,12 +4,7 @@ const sync_table = require('./sync_table');
const app_info = require('./app_info'); const app_info = require('./app_info');
async function getOptionOrNull(name) { async function getOptionOrNull(name) {
try { return await sql.getRowOrNull("SELECT value FROM options WHERE name = ?", [name]);
return await sql.getRowOrNull("SELECT value FROM options WHERE name = ?", [name]);
}
catch (e) {
return await sql.getRowOrNull("SELECT opt_value FROM options WHERE opt_name = ?", [name]);
}
} }
async function getOption(name) { async function getOption(name) {
@@ -19,7 +14,7 @@ async function getOption(name) {
throw new Error("Option " + name + " doesn't exist"); throw new Error("Option " + name + " doesn't exist");
} }
return row['value'] ? row['value'] : row['opt_value']; return row.value;
} }
async function setOption(name, value) { async function setOption(name, value) {

18
src/services/sql.js
View File

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