updates

engine/db/addDb.js

@@ -3,9 +3,9 @@
  */
 
 const encrypt = require("../../functions/encrypt");
-const handler = require("../utils/handler");
 const sanitizeHtml = require("sanitize-html");
 const sanitizeHtmlOptions = require("../utils/sanitizeHtmlOptions");
+const dsqlDbHandler = require("../utils/dsqlDbHandler");
 const updateDb = require("./updateDb");
 
 /**
@@ -44,7 +44,7 @@ async function addDb({ dbFullName, tableName, data, tableSchema, duplicateColumn
      */
 
     if (duplicateColumnName && typeof duplicateColumnName === "string") {
-        const duplicateValue = await handler({
+        const duplicateValue = await dsqlDbHandler({
             queryString: `SELECT * FROM \`${tableName}\` WHERE \`${duplicateColumnName}\`=?`,
             queryValuesArray: [duplicateColumnValue],
             database: dbFullName,
@@ -133,7 +133,7 @@ async function addDb({ dbFullName, tableName, data, tableSchema, duplicateColumn
     const query = `INSERT INTO \`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
     const queryValuesArray = insertValuesArray;
 
-    const newInsert = await handler({
+    const newInsert = await dsqlDbHandler({
         queryString: query,
         database: dbFullName,
         queryValuesArray,

engine/db/deleteDb.js

@@ -1,7 +1,7 @@
 /**
  * Imports: Handle imports
  */
-const handler = require("../utils/handler");
+const dsqlDbHandler = require("../utils/dsqlDbHandler");
 
 /**
  * Delete DB Entry Function
@@ -41,7 +41,7 @@ async function deleteDb({ dbFullName, tableName, identifierColumnName, identifie
          */
         const query = `DELETE FROM ${tableName} WHERE \`${identifierColumnName}\`=?`;
 
-        const deletedEntry = await handler({
+        const deletedEntry = await dsqlDbHandler({
             queryString: query,
             database: dbFullName,
             queryValuesArray: [identifierValue],

engine/db/query.js

@@ -2,8 +2,6 @@
  * Imports: Handle imports
  */
 
-const handler = require("../utils/handler");
-
 /**
  * RAW Query DB Function
  * ==============================================================================
@@ -16,12 +14,13 @@ const handler = require("../utils/handler");
  * @param {string?} params.dbPassword - Database password
  * @param {string?} params.dbUsername - Database username
  * @param {string?} params.query - Query string
+ * @param {string[]?} params.valuesArray - Values array
  *
  * @returns {Promise<object|null>}
  */
-async function query({ dbFullName, dbHost, dbPassword, dbUsername, query }) {
+async function query({ dbFullName, dbHost, dbPassword, dbUsername, query, valuesArray }) {
     /**
-     * Initialize variables
+     * Initialize mysql
      */
     const mysql = require("serverless-mysql")({
         config: {
@@ -43,7 +42,11 @@ async function query({ dbFullName, dbHost, dbPassword, dbUsername, query }) {
         /**
          * Run Query
          */
-        results = await mysql.query(query);
+        if (valuesArray && Array.isArray(valuesArray) && valuesArray[0]) {
+            results = await mysql.query(query, valuesArray);
+        } else {
+            results = await mysql.query(query);
+        }
 
         /**
          * Clean up

engine/db/updateDb.js

@@ -1,7 +1,7 @@
 /**
  * Imports: Handle imports
  */
-const handler = require("../utils/handler");
+const dsqlDbHandler = require("../utils/dsqlDbHandler");
 
 /**
  * Update DB Function
@@ -69,7 +69,7 @@ async function updateDb({ dbFullName, tableName, data, tableSchema, identifierCo
 
     updateValues.push(identifierValue);
 
-    const updatedEntry = await handler({
+    const updatedEntry = await dsqlDbHandler({
         queryString: query,
         database: dbFullName,
         queryValuesArray: updateValues,

engine/utils/dsqlDbHandler.js

@@ -18,7 +18,7 @@ const parseDbResults = require("./parseDbResults");
  *
  * @returns {Promise<object[]|null>}
  */
-async function handler({ queryString, queryValuesArray, database, tableSchema, dbHost, dbUsername, dbPassword, encryptionKey, encryptionSalt }) {
+async function dsqlDbHandler({ queryString, queryValuesArray, database, tableSchema, dbHost, dbUsername, dbPassword, encryptionKey, encryptionSalt }) {
     const mysql = require("serverless-mysql")({
         config: {
             host: dbHost,
@@ -91,4 +91,4 @@ async function handler({ queryString, queryValuesArray, database, tableSchema, d
     }
 }
 
-module.exports = handler;
+module.exports = dsqlDbHandler;