From 3d59792fad9711a7c40b3ee0eef33f6aebb5a1b8 Mon Sep 17 00:00:00 2001 From: Tben Date: Tue, 15 Aug 2023 05:13:25 +0100 Subject: [PATCH] updates --- engine/engine/utils/dbHandler.js | 29 +++++++++++++++++++-- engine/engine/utils/varDatabaseDbHandler.js | 15 +++++++++++ engine/query/get.js | 13 +++++++-- engine/query/utils/runQuery.js | 10 +++++++ package.json | 2 +- 5 files changed, 64 insertions(+), 5 deletions(-) diff --git a/engine/engine/utils/dbHandler.js b/engine/engine/utils/dbHandler.js index 5e921e8..b894692 100644 --- a/engine/engine/utils/dbHandler.js +++ b/engine/engine/utils/dbHandler.js @@ -1,3 +1,17 @@ +/** # MODULE TRACE +====================================================================== + * Detected 8 files that call this module. The files are listed below: +====================================================================== + * `require` Statement Found in [noDatabaseDbHandler.js](d:\GitHub\dsql\engine\engine\utils\noDatabaseDbHandler.js) + * `require` Statement Found in [varDatabaseDbHandler.js](d:\GitHub\dsql\engine\engine\utils\varDatabaseDbHandler.js) + * `require` Statement Found in [addDbEntry.js](d:\GitHub\dsql\engine\query\utils\addDbEntry.js) + * `require` Statement Found in [deleteDbEntry.js](d:\GitHub\dsql\engine\query\utils\deleteDbEntry.js) + * `require` Statement Found in [runQuery.js](d:\GitHub\dsql\engine\query\utils\runQuery.js) + * `require` Statement Found in [updateDbEntry.js](d:\GitHub\dsql\engine\query\utils\updateDbEntry.js) + * `require` Statement Found in [githubLogin.js](d:\GitHub\dsql\engine\user\social\utils\githubLogin.js) + * `require` Statement Found in [googleLogin.js](d:\GitHub\dsql\engine\user\social\utils\googleLogin.js) +==== MODULE TRACE END ==== */ + // @ts-check //////////////////////////////////////// @@ -6,6 +20,7 @@ const fs = require("fs"); const mysql = require("mysql"); +const parseDbResults = require("./parseDbResults"); const connection = mysql.createConnection({ host: process.env.DSQL_HOST, @@ -31,12 +46,13 @@ const connection = mysql.createConnection({ * @param {object} params - Single Param object containing params * @param {string} params.query - Query String * @param {(string | number)[]} [params.values] - Values - * @param {object} [params.dbSchema] - Database Schema + * @param {import("../../../types/database-schema.td").DSQL_DatabaseSchemaType} [params.dbSchema] - Database Schema * @param {string} [params.database] - Target Database + * @param {string} [params.tableName] - Target Table Name * * @returns {Promise<*>} */ -module.exports = async function dbHandler({ query, values, database }) { +module.exports = async function dbHandler({ query, values, database, dbSchema, tableName }) { /** * Declare variables * @@ -123,6 +139,15 @@ module.exports = async function dbHandler({ query, values, database }) { * * @description Return results add to cache if "req" param is passed */ + // if (results && dbSchema && tableName) { + // const tableSchema = dbSchema.tables.find((table) => table.tableName === tableName); + // const parsedResults = parseDbResults({ + // unparsedResults: results, + // tableSchema: tableSchema, + // }); + + // return parsedResults; + // } else if (results) { return results; } else { diff --git a/engine/engine/utils/varDatabaseDbHandler.js b/engine/engine/utils/varDatabaseDbHandler.js index d87377d..19682f5 100644 --- a/engine/engine/utils/varDatabaseDbHandler.js +++ b/engine/engine/utils/varDatabaseDbHandler.js @@ -1,3 +1,18 @@ +/** # MODULE TRACE +====================================================================== + * Detected 9 files that call this module. The files are listed below: +====================================================================== + * `require` Statement Found in [createDbFromSchema.js](d:\GitHub\dsql\engine\engine\createDbFromSchema.js) + * `require` Statement Found in [updateTable.js](d:\GitHub\dsql\engine\engine\utils\updateTable.js) + * `require` Statement Found in [runQuery.js](d:\GitHub\dsql\engine\query\utils\runQuery.js) + * `require` Statement Found in [add-user.js](d:\GitHub\dsql\engine\user\add-user.js) + * `require` Statement Found in [get-user.js](d:\GitHub\dsql\engine\user\get-user.js) + * `require` Statement Found in [login-user.js](d:\GitHub\dsql\engine\user\login-user.js) + * `require` Statement Found in [reauth-user.js](d:\GitHub\dsql\engine\user\reauth-user.js) + * `require` Statement Found in [handleSocialDb.js](d:\GitHub\dsql\engine\user\social\utils\handleSocialDb.js) + * `require` Statement Found in [update-user.js](d:\GitHub\dsql\engine\user\update-user.js) +==== MODULE TRACE END ==== */ + // @ts-check const fs = require("fs"); diff --git a/engine/query/get.js b/engine/query/get.js index 24a5338..d93b4f3 100644 --- a/engine/query/get.js +++ b/engine/query/get.js @@ -1,3 +1,8 @@ +/** # MODULE TRACE +====================================================================== + * No imports found for this Module +==== MODULE TRACE END ==== */ + // @ts-check const runQuery = require("./utils/runQuery"); @@ -63,7 +68,7 @@ async function localGet({ options, dbSchema }) { }); if (error) throw error; - if (result.error) throw new Error(result.error); + if (result?.error) throw new Error(result.error); results = result; return { success: true, payload: results }; @@ -74,7 +79,11 @@ async function localGet({ options, dbSchema }) { console.log("Error in local get Request =>", error.message); - return { success: false, payload: null, error: error.message }; + return { + success: false, + payload: null, + error: error.message, + }; } //////////////////////////////////////// diff --git a/engine/query/utils/runQuery.js b/engine/query/utils/runQuery.js index e88fa55..f712645 100644 --- a/engine/query/utils/runQuery.js +++ b/engine/query/utils/runQuery.js @@ -1,3 +1,13 @@ +/** # MODULE TRACE +====================================================================== + * Detected 4 files that call this module. The files are listed below: +====================================================================== + * `require` Statement Found in [get.js](d:\GitHub\dsql\engine\query\get.js) + * `require` Statement Found in [post.js](d:\GitHub\dsql\engine\query\post.js) + * `require` Statement Found in [add-user.js](d:\GitHub\dsql\engine\user\add-user.js) + * `require` Statement Found in [update-user.js](d:\GitHub\dsql\engine\user\update-user.js) +==== MODULE TRACE END ==== */ + // @ts-check const fs = require("fs"); diff --git a/package.json b/package.json index 8fd1589..c4ae345 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "datasquirel", - "version": "1.7.9", + "version": "1.8.0", "description": "Cloud-based SQL data management tool", "main": "index.js", "bin": {