From b62d9a777c493dd8c95141f2ce9564c12c0e3244 Mon Sep 17 00:00:00 2001 From: plane000 Date: Mon, 22 Oct 2018 11:24:48 +0100 Subject: [PATCH] Redid Database.query code in database.js --- src/database/database.js | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/src/database/database.js b/src/database/database.js index fdf46dd..132bc3a 100644 --- a/src/database/database.js +++ b/src/database/database.js @@ -5,19 +5,15 @@ import {Logger} from '../logger'; export class Database extends BaseDatabase { static async exec(query) { - let connection = BaseDatabase.Connection; - return new Promise((resolve, reject) => { - connection - .query(query) - .then(result => { - Logger.database(JSON.stringify(res, null, 4)); - resolve(result[0][0].result); - }) - .catch(err => { - Logger.error('An error occured while querying a database: ' + err); - reject() - }); - }); + const connection = super.Connection; + try { + const result = await connection.query(query); + Logger.database(JSON.stringify(result, null, 4)); + return result[0][0].result; + } + catch (e) { + Logger.error(`An error occured while querying a database: ${e}`); + } } }