From 18cbf9b2f4942b48dc28e3b8c0fccb8a53d02545 Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 23 Apr 2025 14:27:27 +0100 Subject: [PATCH] Updates --- .../functions/api/query/post.js | 1 + .../functions/backend/db/addDbEntry.d.ts | 3 +- .../functions/backend/db/addDbEntry.js | 27 +++++++++++++++- .../functions/backend/db/runQuery.js | 1 + package-shared/functions/api/query/post.ts | 1 + .../functions/backend/db/addDbEntry.ts | 31 +++++++++++++++++++ .../functions/backend/db/runQuery.ts | 1 + package.json | 2 +- 8 files changed, 64 insertions(+), 3 deletions(-) diff --git a/dist/package-shared/functions/api/query/post.js b/dist/package-shared/functions/api/query/post.js index 1700011..c3ceaf4 100644 --- a/dist/package-shared/functions/api/query/post.js +++ b/dist/package-shared/functions/api/query/post.js @@ -45,6 +45,7 @@ function apiPost(_a) { tableName, dbContext, forceLocal, + debug, }); if (debug) { (0, debug_log_1.default)({ diff --git a/dist/package-shared/functions/backend/db/addDbEntry.d.ts b/dist/package-shared/functions/backend/db/addDbEntry.d.ts index 5158db4..da58d61 100644 --- a/dist/package-shared/functions/backend/db/addDbEntry.d.ts +++ b/dist/package-shared/functions/backend/db/addDbEntry.d.ts @@ -12,9 +12,10 @@ type Param = { encryptionKey?: string; encryptionSalt?: string; forceLocal?: boolean; + debug?: boolean; }; /** * Add a db Entry Function */ -export default function addDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, }: Param): Promise; +export default function addDbEntry({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }: Param): Promise; export {}; diff --git a/dist/package-shared/functions/backend/db/addDbEntry.js b/dist/package-shared/functions/backend/db/addDbEntry.js index 1c23e0b..3fbc7e0 100644 --- a/dist/package-shared/functions/backend/db/addDbEntry.js +++ b/dist/package-shared/functions/backend/db/addDbEntry.js @@ -19,11 +19,12 @@ const updateDbEntry_1 = __importDefault(require("./updateDbEntry")); const encrypt_1 = __importDefault(require("../../dsql/encrypt")); const conn_db_handler_1 = __importDefault(require("../../../utils/db/conn-db-handler")); const check_if_is_master_1 = __importDefault(require("../../../utils/check-if-is-master")); +const debug_log_1 = __importDefault(require("../../../utils/logging/debug-log")); /** * Add a db Entry Function */ function addDbEntry(_a) { - return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, }) { + return __awaiter(this, arguments, void 0, function* ({ dbContext, paradigm, dbFullName, tableName, data, tableSchema, duplicateColumnName, duplicateColumnValue, update, encryptionKey, encryptionSalt, forceLocal, debug, }) { var _b, _c, _d; /** * Initialize variables @@ -31,6 +32,13 @@ function addDbEntry(_a) { const isMaster = forceLocal ? true : (0, check_if_is_master_1.default)({ dbContext, dbFullName }); + if (debug) { + (0, debug_log_1.default)({ + log: isMaster, + addTime: true, + label: "isMaster", + }); + } const DB_CONN = isMaster ? global.DSQL_DB_CONN : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN; @@ -159,6 +167,23 @@ function addDbEntry(_a) { .map(() => "?") .join(",")})`; const queryValuesArray = insertValuesArray; + if (debug) { + (0, debug_log_1.default)({ + log: DB_CONN, + addTime: true, + label: "DB_CONN", + }); + (0, debug_log_1.default)({ + log: query, + addTime: true, + label: "query", + }); + (0, debug_log_1.default)({ + log: queryValuesArray, + addTime: true, + label: "queryValuesArray", + }); + } const newInsert = yield (0, conn_db_handler_1.default)(DB_CONN, query, queryValuesArray); /** * Return statement diff --git a/dist/package-shared/functions/backend/db/runQuery.js b/dist/package-shared/functions/backend/db/runQuery.js index 56f9642..0a43ef5 100644 --- a/dist/package-shared/functions/backend/db/runQuery.js +++ b/dist/package-shared/functions/backend/db/runQuery.js @@ -106,6 +106,7 @@ function runQuery(_a) { duplicateColumnName, duplicateColumnValue, tableSchema, + debug, }); if (!(result === null || result === void 0 ? void 0 : result.insertId)) { error = "Couldn't insert data"; diff --git a/package-shared/functions/api/query/post.ts b/package-shared/functions/api/query/post.ts index 404ae06..7121fd8 100644 --- a/package-shared/functions/api/query/post.ts +++ b/package-shared/functions/api/query/post.ts @@ -55,6 +55,7 @@ export default async function apiPost({ tableName, dbContext, forceLocal, + debug, }); if (debug) { diff --git a/package-shared/functions/backend/db/addDbEntry.ts b/package-shared/functions/backend/db/addDbEntry.ts index 1a7bdfd..26f7c22 100644 --- a/package-shared/functions/backend/db/addDbEntry.ts +++ b/package-shared/functions/backend/db/addDbEntry.ts @@ -6,6 +6,7 @@ import encrypt from "../../dsql/encrypt"; import connDbHandler from "../../../utils/db/conn-db-handler"; import checkIfIsMaster from "../../../utils/check-if-is-master"; import { DbContextsArray } from "./runQuery"; +import debugLog from "../../../utils/logging/debug-log"; type Param = { dbContext?: (typeof DbContextsArray)[number]; @@ -20,6 +21,7 @@ type Param = { encryptionKey?: string; encryptionSalt?: string; forceLocal?: boolean; + debug?: boolean; }; /** @@ -38,6 +40,7 @@ export default async function addDbEntry({ encryptionKey, encryptionSalt, forceLocal, + debug, }: Param): Promise { /** * Initialize variables @@ -46,6 +49,14 @@ export default async function addDbEntry({ ? true : checkIfIsMaster({ dbContext, dbFullName }); + if (debug) { + debugLog({ + log: isMaster, + addTime: true, + label: "isMaster", + }); + } + const DB_CONN = isMaster ? global.DSQL_DB_CONN : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN; @@ -208,6 +219,26 @@ export default async function addDbEntry({ .join(",")})`; const queryValuesArray = insertValuesArray; + if (debug) { + debugLog({ + log: DB_CONN, + addTime: true, + label: "DB_CONN", + }); + + debugLog({ + log: query, + addTime: true, + label: "query", + }); + + debugLog({ + log: queryValuesArray, + addTime: true, + label: "queryValuesArray", + }); + } + const newInsert = await connDbHandler(DB_CONN, query, queryValuesArray); /** diff --git a/package-shared/functions/backend/db/runQuery.ts b/package-shared/functions/backend/db/runQuery.ts index 831acdc..9dee9ee 100644 --- a/package-shared/functions/backend/db/runQuery.ts +++ b/package-shared/functions/backend/db/runQuery.ts @@ -133,6 +133,7 @@ export default async function runQuery({ duplicateColumnName, duplicateColumnValue, tableSchema, + debug, }); if (!result?.insertId) { diff --git a/package.json b/package.json index 97dc03c..9c2281d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.4.4", + "version": "4.4.5", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {