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
+10 -7
View File
@@ -1,6 +1,6 @@
import debugLog from "../logging/debug-log";
import { DSQLErrorObject } from "../../types";
import type { ConnectionConfig, Pool } from "mariadb";
import mariadb, { Connection, ConnectionConfig, Pool } from "mariadb";
export type ConnDBHandlerQueryObject = {
query: string;
@@ -20,9 +20,9 @@ type Return<ReturnType = any> =
*/
export default async function connDbHandler<ReturnType = any>(
/**
* MariaDB Connection Pool Object
* MariaDB Connection
*/
connPool?: Pool,
conn?: mariadb.Connection,
/**
* String Or `ConnDBHandlerQueryObject` Array
*/
@@ -34,13 +34,13 @@ export default async function connDbHandler<ReturnType = any>(
debug?: boolean
): Promise<Return<ReturnType>> {
try {
if (!connPool) throw new Error("No Connection Found!");
if (!conn) throw new Error("No Connection Found!");
if (!query) throw new Error("Query String Required!");
let queryErrorArray: DSQLErrorObject[] = [];
if (typeof query == "string") {
const res = await connPool.query(trimQuery(query), values);
const res = await conn.query(trimQuery(query), values);
if (debug) {
debugLog({
@@ -67,7 +67,7 @@ export default async function connDbHandler<ReturnType = any>(
currentQueryError.sql = queryObj.query;
currentQueryError.sqlValues = queryObj.values;
const queryObjRes = await connPool.query(
const queryObjRes = await conn.query(
trimQuery(queryObj.query),
queryObj.values
);
@@ -90,6 +90,9 @@ export default async function connDbHandler<ReturnType = any>(
`Connection DB Handler Query Error`,
error as Error
);
console.log("query", query);
resArray.push(null);
currentQueryError["error"] = error.message;
queryErrorArray.push(currentQueryError);
@@ -130,7 +133,7 @@ export default async function connDbHandler<ReturnType = any>(
// config: conn,
};
} finally {
connPool?.end();
await conn?.end();
}
}