Bugfix
This commit is contained in:
+5
-1
@@ -9,8 +9,12 @@ type Param = {
|
||||
queryValuesArray?: (string | number)[];
|
||||
tableName?: string;
|
||||
};
|
||||
type Return = {
|
||||
result: any;
|
||||
error?: string;
|
||||
};
|
||||
/**
|
||||
* # Run DSQL users queries
|
||||
*/
|
||||
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }: Param): Promise<any>;
|
||||
export default function runQuery({ dbFullName, query, readOnly, dbSchema, queryValuesArray, tableName, debug, dbContext, }: Param): Promise<Return>;
|
||||
export {};
|
||||
|
||||
+5
-5
@@ -106,7 +106,7 @@ function runQuery(_a) {
|
||||
tableSchema,
|
||||
});
|
||||
if (!(result === null || result === void 0 ? void 0 : result.insertId)) {
|
||||
error = new Error("Couldn't insert data");
|
||||
error = "Couldn't insert data";
|
||||
}
|
||||
break;
|
||||
case "update":
|
||||
@@ -136,16 +136,16 @@ function runQuery(_a) {
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
catch (err) {
|
||||
(0, serverError_1.default)({
|
||||
component: "functions/backend/runQuery",
|
||||
message: error.message,
|
||||
message: err.message,
|
||||
});
|
||||
if (debug && global.DSQL_USE_LOCAL) {
|
||||
console.log("runQuery:error", error.message);
|
||||
console.log("runQuery:error", err.message);
|
||||
}
|
||||
result = null;
|
||||
error = error.message;
|
||||
error = err.message;
|
||||
}
|
||||
return { result, error };
|
||||
});
|
||||
|
||||
@@ -22,42 +22,22 @@ const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handle
|
||||
*/
|
||||
function varReadOnlyDatabaseDbHandler(_a) {
|
||||
return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, }) {
|
||||
/**
|
||||
* Declare variables
|
||||
*
|
||||
* @description Declare "results" variable
|
||||
*/
|
||||
let results;
|
||||
const DB_CONN = global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
|
||||
/**
|
||||
* Fetch from db
|
||||
*
|
||||
* @description Fetch data from db if no cache
|
||||
*/
|
||||
try {
|
||||
results = yield (0, conn_db_handler_1.default)(DB_CONN, queryString, queryValuesArray);
|
||||
////////////////////////////////////////
|
||||
}
|
||||
catch (error) {
|
||||
////////////////////////////////////////
|
||||
(0, serverError_1.default)({
|
||||
component: "varReadOnlyDatabaseDbHandler",
|
||||
message: error.message,
|
||||
noMail: true,
|
||||
});
|
||||
/**
|
||||
* Return error
|
||||
*/
|
||||
return error.message;
|
||||
}
|
||||
finally {
|
||||
DB_CONN === null || DB_CONN === void 0 ? void 0 : DB_CONN.end();
|
||||
}
|
||||
/**
|
||||
* Return results
|
||||
*
|
||||
* @description Return results add to cache if "req" param is passed
|
||||
*/
|
||||
if (results) {
|
||||
const unparsedResults = results;
|
||||
const parsedResults = yield (0, parseDbResults_1.default)({
|
||||
|
||||
Reference in New Issue
Block a user