From c71c1c29ca660415d99232e4f07d951d964ad19b Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Wed, 23 Apr 2025 14:45:44 +0100 Subject: [PATCH] Updates --- dist/package-shared/functions/api/query/post.js | 2 +- dist/package-shared/utils/db/conn-db-handler.d.ts | 4 +++- dist/package-shared/utils/db/conn-db-handler.js | 4 +++- package-shared/functions/api/query/post.ts | 2 +- package-shared/utils/db/conn-db-handler.ts | 6 ++++-- package.json | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dist/package-shared/functions/api/query/post.js b/dist/package-shared/functions/api/query/post.js index c3ceaf4..3114aa3 100644 --- a/dist/package-shared/functions/api/query/post.js +++ b/dist/package-shared/functions/api/query/post.js @@ -61,7 +61,7 @@ function apiPost(_a) { } results = result; if (error) - throw error; + throw new Error(error); let tableSchema; if (dbSchema) { const targetTable = dbSchema.tables.find((table) => table.tableName === tableName); diff --git a/dist/package-shared/utils/db/conn-db-handler.d.ts b/dist/package-shared/utils/db/conn-db-handler.d.ts index 56577eb..15d0250 100644 --- a/dist/package-shared/utils/db/conn-db-handler.d.ts +++ b/dist/package-shared/utils/db/conn-db-handler.d.ts @@ -3,7 +3,9 @@ type QueryObject = { query: string; values?: (string | number | undefined)[]; }; -type Return = ReturnType | null; +type Return = ReturnType | null | { + error: string; +}; /** * # Run Query From MySQL Connection * @description Run a query from a pre-existing MySQL/Mariadb Connection diff --git a/dist/package-shared/utils/db/conn-db-handler.js b/dist/package-shared/utils/db/conn-db-handler.js index 9a6568a..a2233a4 100644 --- a/dist/package-shared/utils/db/conn-db-handler.js +++ b/dist/package-shared/utils/db/conn-db-handler.js @@ -92,7 +92,9 @@ values, debug) { label: "Error", }); } - return null; + return { + error: `Connection DB Handler Error: ${error.message}`, + }; } finally { conn === null || conn === void 0 ? void 0 : conn.end(); diff --git a/package-shared/functions/api/query/post.ts b/package-shared/functions/api/query/post.ts index 7121fd8..3b28702 100644 --- a/package-shared/functions/api/query/post.ts +++ b/package-shared/functions/api/query/post.ts @@ -74,7 +74,7 @@ export default async function apiPost({ results = result; - if (error) throw error; + if (error) throw new Error(error); let tableSchema: | import("../../../types").DSQL_TableSchemaType diff --git a/package-shared/utils/db/conn-db-handler.ts b/package-shared/utils/db/conn-db-handler.ts index d77c43b..5a2feb9 100644 --- a/package-shared/utils/db/conn-db-handler.ts +++ b/package-shared/utils/db/conn-db-handler.ts @@ -6,7 +6,7 @@ type QueryObject = { values?: (string | number | undefined)[]; }; -type Return = ReturnType | null; +type Return = ReturnType | null | { error: string }; /** * # Run Query From MySQL Connection @@ -96,7 +96,9 @@ export default async function connDbHandler( }); } - return null; + return { + error: `Connection DB Handler Error: ${error.message}`, + }; } finally { conn?.end(); } diff --git a/package.json b/package.json index e9d33c3..8fec947 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "4.4.8", + "version": "4.4.9", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {