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

renamed db columns to camelCase

Browse Source
This commit is contained in:
azivner
2018-01-28 19:30:14 -05:00
parent 55d8ef7e81
commit 3b1f928fbc
58 changed files with 778 additions and 778 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
services/options.js
View File

@@ -3,45 +3,45 @@ const utils = require('./utils');
const sync_table = require('./sync_table');
const app_info = require('./app_info');
async function getOptionOrNull(optName) {
return await sql.getFirstOrNull("SELECT opt_value FROM options WHERE opt_name = ?", [optName]);
async function getOptionOrNull(name) {
return await sql.getFirstOrNull("SELECT value FROM options WHERE name = ?", [name]);
}
async function getOption(optName) {
const row = await getOptionOrNull(optName);
async function getOption(name) {
const row = await getOptionOrNull(name);
if (!row) {
throw new Error("Option " + optName + " doesn't exist");
throw new Error("Option " + name + " doesn't exist");
}
return row['opt_value'];
return row['value'];
}
async function setOption(optName, optValue, sourceId = null) {
const opt = await sql.getFirst("SELECT * FROM options WHERE opt_name = ?", [optName]);
async function setOption(name, value, sourceId = null) {
const opt = await sql.getFirst("SELECT * FROM options WHERE name = ?", [name]);
if (!opt) {
throw new Error(`Option ${optName} doesn't exist`);
throw new Error(`Option ${name} doesn't exist`);
}
if (opt.is_synced) {
await sync_table.addOptionsSync(optName, sourceId);
if (opt.isSynced) {
await sync_table.addOptionsSync(name, sourceId);
}
await sql.execute("UPDATE options SET opt_value = ?, date_modified = ? WHERE opt_name = ?",
[optValue, utils.nowDate(), optName]);
await sql.execute("UPDATE options SET value = ?, dateModified = ? WHERE name = ?",
[value, utils.nowDate(), name]);
}
async function createOption(optName, optValue, isSynced, sourceId = null) {
async function createOption(name, value, isSynced, sourceId = null) {
await sql.insert("options", {
opt_name: optName,
opt_value: optValue,
is_synced: isSynced,
date_modified: utils.nowDate()
name: name,
value: value,
isSynced: isSynced,
dateModified: utils.nowDate()
});
if (isSynced) {
await sync_table.addOptionsSync(optName, sourceId);
await sync_table.addOptionsSync(name, sourceId);
}
}
@@ -56,7 +56,7 @@ async function initOptions(startNotePath) {
await createOption('encrypted_data_key', '', true);
await createOption('encrypted_data_key_iv', '', true);
await createOption('start_note_path', startNotePath, false);
await createOption('start_notePath', startNotePath, false);
await createOption('protected_session_timeout', 600, true);
await createOption('history_snapshot_time_interval', 600, true);
await createOption('last_backup_date', utils.nowDate(), false);