From 87e415992cff18436218459e3db3b35dab6bbbc2 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Sat, 31 Mar 2018 23:11:43 -0400
Subject: [PATCH] removed support for old option schema of opt_name and
 opt_value

---
 src/services/options.js |  9 ++-------
 src/services/sql.js     | 18 ++----------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/services/options.js b/src/services/options.js
index aa7e5b9b6..112e5ccc5 100644
--- a/src/services/options.js
+++ b/src/services/options.js
@@ -4,12 +4,7 @@ const sync_table = require('./sync_table');
 const app_info = require('./app_info');
 
 async function getOptionOrNull(name) {
-    try {
-        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]);
-    }
+    return await sql.getRowOrNull("SELECT value FROM options WHERE name = ?", [name]);
 }
 
 async function getOption(name) {
@@ -19,7 +14,7 @@ async function getOption(name) {
         throw new Error("Option " + name + " doesn't exist");
     }
 
-    return row['value'] ? row['value'] : row['opt_value'];
+    return row.value;
 }
 
 async function setOption(name, value) {
diff --git a/src/services/sql.js b/src/services/sql.js
index c30e6f53a..271f1ae19 100644
--- a/src/services/sql.js
+++ b/src/services/sql.js
@@ -244,14 +244,7 @@ async function doInTransaction(func) {
 }
 
 async function isDbUpToDate() {
-    let dbVersion;
-
-    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 dbVersion = parseInt(await getValue("SELECT value FROM options WHERE name = 'db_version'"));
 
     const upToDate = dbVersion >= app_info.db_version;
 
@@ -263,14 +256,7 @@ async function isDbUpToDate() {
 }
 
 async function isUserInitialized() {
-    let 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'");
-    }
+    const username = await getValue("SELECT value FROM options WHERE name = 'username'");
 
     return !!username;
 }