Update Types
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
|
||||
const fs = require("fs");
|
||||
const mysql = require("mysql");
|
||||
const endConnection = require("./endConnection");
|
||||
|
||||
const connection = mysql.createConnection({
|
||||
host: process.env.DSQL_HOST,
|
||||
@@ -35,7 +34,7 @@ const connection = mysql.createConnection({
|
||||
* @param {object} [params.dbSchema] - Database Schema
|
||||
* @param {string} [params.database] - Target Database
|
||||
*
|
||||
* @returns {Promise<object | null>}
|
||||
* @returns {Promise<*>}
|
||||
*/
|
||||
module.exports = async function dbHandler({ query, values, database }) {
|
||||
/**
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
* Regular expression to match default fields
|
||||
*
|
||||
* @description Regular expression to match default fields
|
||||
* @type {RegExp}
|
||||
*/
|
||||
const defaultFieldsRegexp = /^id$|^date_created$|^date_created_code$|^date_created_timestamp$|^date_updated$|^date_updated_code$|^date_updated_timestamp$/;
|
||||
|
||||
|
||||
@@ -5,10 +5,12 @@ const mysql = require("mysql");
|
||||
/**
|
||||
* @param {mysql.Connection} connection - the active MYSQL connection
|
||||
*/
|
||||
module.exports = function endConnection(connection) {
|
||||
function endConnection(connection) {
|
||||
if (connection.state !== "disconnected") {
|
||||
connection.end((err) => {
|
||||
console.log(err?.message);
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = endConnection;
|
||||
|
||||
@@ -11,7 +11,7 @@ const defaultFieldsRegexp = require("./defaultFieldsRegexp");
|
||||
* fields
|
||||
*
|
||||
* @param {object} params - Single object params
|
||||
* @param {{}[]} params.unparsedResults - Array of data objects containing Fields(keys)
|
||||
* @param {*[]} params.unparsedResults - Array of data objects containing Fields(keys)
|
||||
* and corresponding values of the fields(values)
|
||||
* @param {import("../../../types/database-schema.td").DSQL_TableSchemaType} [params.tableSchema] - Table schema
|
||||
* @returns {Promise<object[]|null>}
|
||||
@@ -21,6 +21,7 @@ module.exports = async function parseDbResults({ unparsedResults, tableSchema })
|
||||
* Declare variables
|
||||
*
|
||||
* @description Declare "results" variable
|
||||
* @type {*[]}
|
||||
*/
|
||||
let parsedResults = [];
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ const dbHandler = require("./dbHandler");
|
||||
* @param {string[]} [params.queryValuesArray] - Values Array
|
||||
* @param {string} params.database - Database name
|
||||
* @param {import("../../../types/database-schema.td").DSQL_TableSchemaType} [params.tableSchema] - Table schema
|
||||
* @returns {Promise<any[]|null>}
|
||||
* @returns {Promise<*>}
|
||||
*/
|
||||
module.exports = async function varDatabaseDbHandler({ queryString, queryValuesArray, database, tableSchema }) {
|
||||
/**
|
||||
@@ -29,6 +29,7 @@ module.exports = async function varDatabaseDbHandler({ queryString, queryValuesA
|
||||
* Declare variables
|
||||
*
|
||||
* @description Declare "results" variable
|
||||
* @type {*}
|
||||
*/
|
||||
let results;
|
||||
|
||||
|
||||
@@ -1,57 +0,0 @@
|
||||
// @ts-check
|
||||
|
||||
const fs = require("fs");
|
||||
const parseDbResults = require("./parseDbResults");
|
||||
const dbHandler = require("./dbHandler");
|
||||
|
||||
/**
|
||||
*
|
||||
* @param {object} param0
|
||||
* @param {string} param0.queryString
|
||||
* @param {object} param0.database
|
||||
* @param {object[]} [param0.queryValuesArray]
|
||||
* @param {object | null} [param0.tableSchema]
|
||||
* @returns
|
||||
*/
|
||||
module.exports = async function varReadOnlyDatabaseDbHandler({ queryString, database, queryValuesArray, tableSchema }) {
|
||||
/**
|
||||
* Declare variables
|
||||
*
|
||||
* @description Declare "results" variable
|
||||
*/
|
||||
let results;
|
||||
|
||||
/**
|
||||
* Fetch from db
|
||||
*
|
||||
* @description Fetch data from db if no cache
|
||||
*/
|
||||
try {
|
||||
results = await dbHandler({ query: queryString, values: queryValuesArray, database: database });
|
||||
|
||||
////////////////////////////////////////
|
||||
} catch (/** @type {*} */ error) {
|
||||
////////////////////////////////////////
|
||||
|
||||
console.log("\x1b[31mvarReadOnlyDatabaseDbHandler ERROR\x1b[0m =>", database, error.message);
|
||||
|
||||
/**
|
||||
* Return error
|
||||
*/
|
||||
return error.message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return results
|
||||
*
|
||||
* @description Return results add to cache if "req" param is passed
|
||||
*/
|
||||
if (results) {
|
||||
const unparsedResults = results;
|
||||
// deepcode ignore reDOS: <please specify a reason of ignoring this>
|
||||
const parsedResults = await parseDbResults({ unparsedResults: unparsedResults, tableSchema: tableSchema });
|
||||
return parsedResults;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
};
|
||||
Reference in New Issue
Block a user