This commit is contained in:
Benjamin Toby
2025-07-07 09:14:37 +01:00
parent 6acf0f2cd6
commit ccb5605b58
30 changed files with 292 additions and 166 deletions
+7 -4
View File
@@ -1,6 +1,7 @@
import debugLog from "../logging/debug-log";
import { DSQLErrorObject } from "../../types";
import mariadb, { Connection, ConnectionConfig, Pool } from "mariadb";
import grabDSQLConnection from "../grab-dsql-connection";
export type ConnDBHandlerQueryObject = {
query: string;
@@ -33,14 +34,16 @@ export default async function connDbHandler<ReturnType = any>(
values?: ConnDBHandlerQueryObject["values"],
debug?: boolean
): Promise<Return<ReturnType>> {
const finalConnection = conn || (await grabDSQLConnection());
try {
if (!conn) throw new Error("No Connection Found!");
if (!finalConnection) throw new Error("No Connection Found!");
if (!query) throw new Error("Query String Required!");
let queryErrorArray: DSQLErrorObject[] = [];
if (typeof query == "string") {
const res = await conn.query(trimQuery(query), values);
const res = await finalConnection.query(trimQuery(query), values);
if (debug) {
debugLog({
@@ -67,7 +70,7 @@ export default async function connDbHandler<ReturnType = any>(
currentQueryError.sql = queryObj.query;
currentQueryError.sqlValues = queryObj.values;
const queryObjRes = await conn.query(
const queryObjRes = await finalConnection.query(
trimQuery(queryObj.query),
queryObj.values
);
@@ -133,7 +136,7 @@ export default async function connDbHandler<ReturnType = any>(
// config: conn,
};
} finally {
await conn?.end();
await finalConnection?.end();
}
}