This commit is contained in:
Benjamin Toby
2025-07-06 17:00:35 +01:00
parent b38ddc9f21
commit 6acf0f2cd6
48 changed files with 353 additions and 622 deletions
+7 -2
View File
@@ -23,7 +23,7 @@ const grab_dsql_connection_1 = __importDefault(require("../../utils/grab-dsql-co
function dbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, values, noErrorLogs, }) {
var _b;
const CONNECTION = (0, grab_dsql_connection_1.default)();
const CONNECTION = yield (0, grab_dsql_connection_1.default)();
let results;
try {
if (query && values) {
@@ -54,7 +54,12 @@ function dbHandler(_a) {
yield (CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.end());
}
if (results) {
return JSON.parse(JSON.stringify(results));
if (Array.isArray(results)) {
return Array.from(results);
}
else {
return results;
}
}
else {
return null;
@@ -53,7 +53,6 @@ function fullAccessDbHandler(_a) {
return error.message;
}
finally {
DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
}
/**
* Return results
@@ -1,4 +0,0 @@
/**
* # No Database DB Handler
*/
export default function noDatabaseDbHandler(queryString: string): Promise<any>;
@@ -1,64 +0,0 @@
"use strict";
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = noDatabaseDbHandler;
const fs_1 = __importDefault(require("fs"));
const serverError_1 = __importDefault(require("./serverError"));
const NO_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-db/NO_DB_HANDLER"));
/**
* # No Database DB Handler
*/
function noDatabaseDbHandler(queryString) {
return __awaiter(this, void 0, void 0, function* () {
var _a;
((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", queryString + "\n" + Date() + "\n\n\n", "utf8");
/**
* Declare variables
*
* @description Declare "results" variable
*/
let results;
/**
* Fetch from db
*
* @description Fetch data from db if no cache
*/
try {
/** ********************* Run Query */
results = yield (0, NO_DB_HANDLER_1.default)(queryString);
////////////////////////////////////////
////////////////////////////////////////
////////////////////////////////////////
}
catch ( /** @type {any} */error) {
(0, serverError_1.default)({
component: "noDatabaseDbHandler",
message: error.message,
});
console.log("ERROR in noDatabaseDbHandler =>", error.message);
}
/**
* Return results
*
* @description Return results add to cache if "req" param is passed
*/
if (results) {
return results;
}
else {
return null;
}
});
}
+15 -1
View File
@@ -18,14 +18,28 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle
const mariadb_1 = __importDefault(require("mariadb"));
function suDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, database, user, values, }) {
const connection = mariadb_1.default.createPool({
const connection = yield mariadb_1.default.createConnection({
host: process.env.DSQL_DB_HOST,
user: process.env.DSQL_DB_USERNAME,
password: process.env.DSQL_DB_PASSWORD,
database: database,
charset: "utf8mb4",
ssl: (0, grabDbSSL_1.default)(),
supportBigNumbers: true,
bigNumberStrings: false,
dateStrings: true,
});
// const connection = mariadb.createPool({
// host: process.env.DSQL_DB_HOST,
// user: process.env.DSQL_DB_USERNAME,
// password: process.env.DSQL_DB_PASSWORD,
// database: database,
// charset: "utf8mb4",
// ssl: grabDbSSL(),
// supportBigNumbers: true,
// bigNumberStrings: false,
// dateStrings: true,
// });
const results = yield (0, conn_db_handler_1.default)(connection, query);
return results;
});
+4 -1
View File
@@ -20,13 +20,16 @@ const grabDbSSL_1 = __importDefault(require("../../utils/backend/grabDbSSL"));
function userDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ query, user, database, debug, tableSchema, values, }) {
const { fullName, host, username, password } = yield (0, grab_mariadb_main_user_for_user_1.default)({ user });
const connection = mariadb_1.default.createPool({
const connection = yield mariadb_1.default.createConnection({
host,
user: username,
password: password,
database: database,
charset: "utf8mb4",
ssl: (0, grabDbSSL_1.default)(),
supportBigNumbers: true,
bigNumberStrings: false,
dateStrings: true,
});
const results = yield (0, conn_db_handler_1.default)(connection, query);
return results;
@@ -23,11 +23,11 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle
function varDatabaseDbHandler(_a) {
return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, database, tableSchema, debug, }) {
var _b;
let CONNECTION = (0, grab_dsql_connection_1.default)({ fa: true });
let CONNECTION = yield (0, grab_dsql_connection_1.default)({ fa: true });
if (global.DSQL_USE_LOCAL)
CONNECTION = (0, grab_dsql_connection_1.default)({ local: true });
CONNECTION = yield (0, grab_dsql_connection_1.default)({ local: true });
if (database === null || database === void 0 ? void 0 : database.match(/^datasquirel$/))
CONNECTION = (0, grab_dsql_connection_1.default)();
CONNECTION = yield (0, grab_dsql_connection_1.default)();
if (debug) {
console.log(`varDatabaseDbHandler:query:`, queryString);
console.log(`varDatabaseDbHandler:values:`, queryValuesArray);
@@ -40,7 +40,6 @@ function varReadOnlyDatabaseDbHandler(_a) {
return error.message;
}
finally {
DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
}
if (results) {
const unparsedResults = results;