Updates
This commit is contained in:
+5
-2
@@ -36,14 +36,17 @@ function dbHandler(_a) {
|
||||
}
|
||||
}
|
||||
catch (error) {
|
||||
console.log("Connection Info =>", CONNECTION === null || CONNECTION === void 0 ? void 0 : CONNECTION.info);
|
||||
// console.log("Connection Info =>", JSON.stringify(CONNECTION?.info));
|
||||
if (error.message &&
|
||||
typeof error.message == "string" &&
|
||||
error.message.match(/Access denied for user.*password/i)) {
|
||||
throw new Error("Authentication Failed!");
|
||||
}
|
||||
if (!noErrorLogs) {
|
||||
console.log("ERROR in dbHandler =>", error.message);
|
||||
// console.log("ERROR in dbHandler =>", error.message);
|
||||
// console.log(".........................................");
|
||||
// console.log(".........................................");
|
||||
// console.log(".........................................");
|
||||
console.log(error);
|
||||
const tmpFolder = path_1.default.resolve(process.cwd(), "./.tmp");
|
||||
if (!fs_1.default.existsSync(tmpFolder))
|
||||
|
||||
@@ -17,6 +17,7 @@ const mariadb_1 = __importDefault(require("mariadb"));
|
||||
const grab_mariadb_main_user_for_user_1 = __importDefault(require("./grab-mariadb-main-user-for-user"));
|
||||
const conn_db_handler_1 = __importDefault(require("../../utils/db/conn-db-handler"));
|
||||
const grabDbSSL_1 = __importDefault(require("../../utils/backend/grabDbSSL"));
|
||||
const lodash_1 = __importDefault(require("lodash"));
|
||||
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 });
|
||||
@@ -34,6 +35,26 @@ function userDbHandler(_a) {
|
||||
metaAsArray: true,
|
||||
});
|
||||
const results = yield (0, conn_db_handler_1.default)(connection, query);
|
||||
if (Array.isArray(results)) {
|
||||
const parsedDbResults = results.map((res) => parseResultObject(res));
|
||||
return parsedDbResults;
|
||||
}
|
||||
return results;
|
||||
});
|
||||
}
|
||||
function parseResultObject(res) {
|
||||
if (typeof res !== "object")
|
||||
return res;
|
||||
if (!res)
|
||||
return res;
|
||||
const newRes = lodash_1.default.cloneDeep(res);
|
||||
const resKeys = Object.keys(res);
|
||||
for (let i = 0; i < resKeys.length; i++) {
|
||||
const k = resKeys[i];
|
||||
const val = newRes[k];
|
||||
if (typeof val == "object" && val) {
|
||||
newRes[k] = "";
|
||||
}
|
||||
}
|
||||
return newRes;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user