Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2025-08-05 18:46:53 +01:00
parent eb98148533
commit 689f885d9d
5 changed files with 58 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/package-shared/functions/backend/dbHandler.js vendored
View File

@ -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))

21
dist/package-shared/functions/backend/user-db-handler.js vendored
View File

@ -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;
}

8
package-shared/functions/backend/dbHandler.ts
View File

@ -40,8 +40,7 @@ export default async function dbHandler<
results = queryResults[0];
}
} catch (error: any) {
console.log("Connection Info =>", CONNECTION?.info);
// console.log("Connection Info =>", JSON.stringify(CONNECTION?.info));
if (
error.message &&
typeof error.message == "string" &&
@ -51,7 +50,10 @@ export default async function dbHandler<
}
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.resolve(process.cwd(), "./.tmp");

26
package-shared/functions/backend/user-db-handler.ts
View File

@ -3,6 +3,7 @@ import { DSQL_TableSchemaType, UserType } from "../../types";
import grabMariadbMainUserForUser from "./grab-mariadb-main-user-for-user";
import connDbHandler from "../../utils/db/conn-db-handler";
import grabDbSSL from "../../utils/backend/grabDbSSL";
import _ from "lodash";
type Params = {
query?: string;
@ -40,5 +41,30 @@ export default async function userDbHandler({
const results = await connDbHandler(connection, query);
if (Array.isArray(results)) {
const parsedDbResults = results.map((res) => parseResultObject(res));
return parsedDbResults;
}
return results;
}
function parseResultObject(res: any) {
if (typeof res !== "object") return res;
if (!res) return res;
const newRes = _.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;
}

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/datasquirel",
"version": "5.1.7",
"version": "5.1.8",
"description": "Cloud-based SQL data management tool",
"main": "dist/index.js",
"bin": {