Updates
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@ export default function connDbHandler<ReturnType = any>(
|
||||
/**
|
||||
* MariaDB Connection
|
||||
*/
|
||||
conn?: mariadb.Connection,
|
||||
conn?: mariadb.Connection | null,
|
||||
/**
|
||||
* String Or `ConnDBHandlerQueryObject` Array
|
||||
*/
|
||||
|
||||
+6
-16
@@ -34,7 +34,6 @@ query,
|
||||
*/
|
||||
values, debug) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
var _a, _b;
|
||||
const finalConnection = conn || (yield (0, grab_dsql_connection_1.default)());
|
||||
try {
|
||||
if (!finalConnection)
|
||||
@@ -43,18 +42,15 @@ values, debug) {
|
||||
throw new Error("Query String Required!");
|
||||
let queryErrorArray = [];
|
||||
if (typeof query == "string") {
|
||||
const res = yield finalConnection.query(trimQuery(query), values);
|
||||
const [results] = yield finalConnection.query(trimQuery(query), values);
|
||||
if (debug) {
|
||||
(0, debug_log_1.default)({
|
||||
log: res,
|
||||
log: results,
|
||||
addTime: true,
|
||||
label: "res",
|
||||
});
|
||||
}
|
||||
if (Array.isArray(res)) {
|
||||
return Array.from(res);
|
||||
}
|
||||
return res;
|
||||
return results;
|
||||
}
|
||||
else if (typeof query == "object") {
|
||||
const resArray = [];
|
||||
@@ -65,22 +61,17 @@ values, debug) {
|
||||
currentQueryError.sql = queryObj.query;
|
||||
currentQueryError.sqlValues = queryObj.values;
|
||||
const queryObjRes = yield finalConnection.query(trimQuery(queryObj.query), queryObj.values);
|
||||
const results = queryObjRes[0];
|
||||
if (debug) {
|
||||
(0, debug_log_1.default)({
|
||||
log: queryObjRes,
|
||||
log: results,
|
||||
addTime: true,
|
||||
label: "queryObjRes",
|
||||
});
|
||||
}
|
||||
if (Array.isArray(queryObjRes)) {
|
||||
resArray.push(Array.from(queryObjRes));
|
||||
}
|
||||
else {
|
||||
resArray.push(queryObjRes);
|
||||
}
|
||||
resArray.push(results);
|
||||
}
|
||||
catch (error) {
|
||||
(_a = global.ERROR_CALLBACK) === null || _a === void 0 ? void 0 : _a.call(global, `Connection DB Handler Query Error`, error);
|
||||
console.log("query", query);
|
||||
resArray.push(null);
|
||||
currentQueryError["error"] = error.message;
|
||||
@@ -106,7 +97,6 @@ values, debug) {
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
(_b = global.ERROR_CALLBACK) === null || _b === void 0 ? void 0 : _b.call(global, `Connection DB Handler Error`, error);
|
||||
if (debug) {
|
||||
(0, debug_log_1.default)({
|
||||
log: `Connection DB Handler Error: ${error.message}`,
|
||||
|
||||
Reference in New Issue
Block a user