Updates

2025-01-14 00:01:02 +01:00
parent 8f00f333aa
commit d586de0639
90 changed files with 533 additions and 960 deletions
@@ -90,8 +90,7 @@ function addDbEntry(_a) {
                ? yield dbHandler(`SELECT * FROM \`${tableName}\` WHERE \`${duplicateColumnName}\`=?`, [duplicateColumnValue])
                : yield dbHandler({
                    paradigm: "Read Only",
-                    database: dbFullName,
-                    queryString: `SELECT * FROM \`${tableName}\` WHERE \`${duplicateColumnName}\`=?`,
+                    queryString: `SELECT * FROM \`${dbFullName}\`.\`${tableName}\` WHERE \`${duplicateColumnName}\`=?`,
                    queryValues: [duplicateColumnValue],
                });
            if ((duplicateValue === null || duplicateValue === void 0 ? void 0 : duplicateValue[0]) && !update) {
@@ -191,13 +190,12 @@ function addDbEntry(_a) {
            insertValuesArray.push(Date.now());
        }
        ////////////////////////////////////////
-        const query = `INSERT INTO \`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
+        const query = `INSERT INTO \`${dbFullName}\`.\`${tableName}\` (${insertKeysArray.join(",")}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
        const queryValuesArray = insertValuesArray;
        const newInsert = isMaster
            ? yield dbHandler(query, queryValuesArray)
            : yield dbHandler({
                paradigm,
-                database: dbFullName,
                queryString: query,
                queryValues: queryValuesArray,
            });
@@ -41,13 +41,12 @@ function deleteDbEntry(_a) {
             *
             * @description
             */
-            const query = `DELETE FROM ${tableName} WHERE \`${identifierColumnName}\`=?`;
+            const query = `DELETE FROM \`${dbFullName}\`.\`${tableName}\` WHERE \`${identifierColumnName}\`=?`;
            const deletedEntry = isMaster
                ? yield dbHandler(query, [identifierValue])
                : yield dbHandler({
                    paradigm,
                    queryString: query,
-                    database: dbFullName,
                    queryValues: [identifierValue],
                });
            /**
@@ -71,7 +71,6 @@ function runQuery(_a) {
                    result = yield (0, varReadOnlyDatabaseDbHandler_1.default)({
                        queryString: formattedQuery,
                        queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
-                        database: dbFullName,
                        tableSchema,
                        useLocal: local,
                    });
@@ -80,7 +79,6 @@ function runQuery(_a) {
                    result = yield (0, fullAccessDbHandler_1.default)({
                        queryString: formattedQuery,
                        queryValuesArray: queryValuesArray === null || queryValuesArray === void 0 ? void 0 : queryValuesArray.map((vl) => String(vl)),
-                        database: dbFullName,
                        tableSchema,
                        local,
                    });
@@ -126,13 +126,12 @@ function updateDbEntry(_a) {
        updateKeyValueArray.push(`date_updated_code='${Date.now()}'`);
        ////////////////////////////////////////
        ////////////////////////////////////////
-        const query = `UPDATE ${tableName} SET ${updateKeyValueArray.join(",")} WHERE \`${identifierColumnName}\`=?`;
+        const query = `UPDATE \`${dbFullName}\`.\`${tableName}\` SET ${updateKeyValueArray.join(",")} WHERE \`${identifierColumnName}\`=?`;
        updateValues.push(identifierValue);
        const updatedEntry = isMaster
            ? yield dbHandler(query, updateValues)
            : yield dbHandler({
                paradigm,
-                database: dbFullName,
                queryString: query,
                queryValues: updateValues,
            });
@@ -15,18 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = dbHandler;
 const fs_1 = __importDefault(require("fs"));
 const serverError_1 = __importDefault(require("./serverError"));
-const serverless_mysql_1 = __importDefault(require("serverless-mysql"));
-const grabDbSSL_1 = __importDefault(require("../../utils/backend/grabDbSSL"));
-const connection = (0, serverless_mysql_1.default)({
-    config: {
-        host: process.env.DSQL_DB_HOST,
-        user: process.env.DSQL_DB_USERNAME,
-        password: process.env.DSQL_DB_PASSWORD,
-        database: process.env.DSQL_DB_NAME,
-        charset: "utf8mb4",
-        ssl: (0, grabDbSSL_1.default)(),
-    },
-});
 /**
 * # Main DB Handler Function
 */
@@ -35,11 +23,6 @@ function dbHandler(...args) {
        var _a;
        ((_a = process.env.NODE_ENV) === null || _a === void 0 ? void 0 : _a.match(/dev/)) &&
            fs_1.default.appendFileSync("./.tmp/sqlQuery.sql", args[0] + "\n" + Date() + "\n\n\n", "utf8");
-        /**
-         * Declare variables
-         *
-         * @description Declare "results" variable
-         */
        let results;
        /**
         * Fetch from db
@@ -47,6 +30,7 @@ function dbHandler(...args) {
         * @description Fetch data from db if no cache
         */
        try {
+            const connection = global.DSQL_DB_CONN;
            results = yield new Promise((resolve, reject) => {
                connection.query(...args, (error, result, fields) => {
                    if (error) {
@@ -1,6 +1,5 @@
 type Param = {
    queryString: string;
-    database: string;
    local?: boolean;
    tableSchema?: import("../../types").DSQL_TableSchemaType | null;
    queryValuesArray?: string[];
@@ -8,5 +7,5 @@ type Param = {
 /**
 * # Full Access Db Handler
 */
-export default function fullAccessDbHandler({ queryString, database, tableSchema, queryValuesArray, local, }: Param): Promise<any>;
+export default function fullAccessDbHandler({ queryString, tableSchema, queryValuesArray, local, }: Param): Promise<any>;
 export {};
@@ -22,7 +22,7 @@ const serverError_1 = __importDefault(require("./serverError"));
 * # Full Access Db Handler
 */
 function fullAccessDbHandler(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queryString, database, tableSchema, queryValuesArray, local, }) {
+    return __awaiter(this, arguments, void 0, function* ({ queryString, tableSchema, queryValuesArray, local, }) {
        /**
         * Declare variables
         *
@@ -40,7 +40,6 @@ function fullAccessDbHandler(_a) {
                ? yield (0, LOCAL_DB_HANDLER_1.default)(queryString, queryValuesArray)
                : yield (0, DSQL_USER_DB_HANDLER_1.default)({
                    paradigm: "Full Access",
-                    database,
                    queryString,
                    queryValues: queryValuesArray,
                });
@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = noDatabaseDbHandler;
 const fs_1 = __importDefault(require("fs"));
 const serverError_1 = __importDefault(require("./serverError"));
-const NO_DB_HANDLER_1 = __importDefault(require("../../../package-shared/utils/backend/global-db/NO_DB_HANDLER"));
+const NO_DB_HANDLER_1 = __importDefault(require("@/package-shared/utils/backend/global-db/NO_DB_HANDLER"));
 /**
 * # No Database DB Handler
 */
@@ -33,7 +33,6 @@ function varDatabaseDbHandler(_a) {
            : (database === null || database === void 0 ? void 0 : database.match(/^datasquirel$/))
                ? true
                : false;
-        /** @type {any} */
        const FINAL_DB_HANDLER = useLocal
            ? LOCAL_DB_HANDLER_1.default
            : isMaster
@@ -54,7 +53,6 @@ function varDatabaseDbHandler(_a) {
                    ? yield FINAL_DB_HANDLER(queryString, queryValuesArray)
                    : yield FINAL_DB_HANDLER({
                        paradigm: "Full Access",
-                        database,
                        queryString,
                        queryValues: queryValuesArray,
                    });
@@ -64,12 +62,12 @@ function varDatabaseDbHandler(_a) {
                    ? yield FINAL_DB_HANDLER(queryString)
                    : yield FINAL_DB_HANDLER({
                        paradigm: "Full Access",
-                        database,
                        queryString,
                    });
            }
        }
        catch (error) {
+            console.log(`varDatabaseDbHandler Error: ${error.message}`);
            (0, serverError_1.default)({
                component: "varDatabaseDbHandler/lines-29-32",
                message: error.message,
@@ -1,6 +1,5 @@
 type Param = {
    queryString: string;
-    database: string;
    queryValuesArray?: string[];
    tableSchema?: import("../../types").DSQL_TableSchemaType;
    useLocal?: boolean;
@@ -9,5 +8,5 @@ type Param = {
 * # Read Only Db Handler with Varaibles
 * @returns
 */
-export default function varReadOnlyDatabaseDbHandler({ queryString, database, queryValuesArray, tableSchema, useLocal, }: Param): Promise<any>;
+export default function varReadOnlyDatabaseDbHandler({ queryString, queryValuesArray, tableSchema, useLocal, }: Param): Promise<any>;
 export {};
@@ -23,7 +23,7 @@ const LOCAL_DB_HANDLER_1 = __importDefault(require("../../utils/backend/global-d
 * @returns
 */
 function varReadOnlyDatabaseDbHandler(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ queryString, database, queryValuesArray, tableSchema, useLocal, }) {
+    return __awaiter(this, arguments, void 0, function* ({ queryString, queryValuesArray, tableSchema, useLocal, }) {
        /**
         * Declare variables
         *
@@ -40,7 +40,6 @@ function varReadOnlyDatabaseDbHandler(_a) {
                ? yield (0, LOCAL_DB_HANDLER_1.default)(queryString, queryValuesArray)
                : yield (0, DSQL_USER_DB_HANDLER_1.default)({
                    paradigm: "Read Only",
-                    database,
                    queryString,
                    queryValues: queryValuesArray,
                });