Updates

2025-01-14 00:01:02 +01:00
parent 8f00f333aa
commit d586de0639
90 changed files with 533 additions and 960 deletions
@@ -8,10 +8,8 @@ type Param = {
    dbFullName: string;
    tableName: string;
    tableInfoArray: any[];
-    dbSchema?: DSQL_DatabaseSchemaType[];
    tableSchema?: DSQL_TableSchemaType;
    recordedDbEntry?: any;
-    clone?: boolean;
 };

 /**
@@ -21,8 +19,6 @@ export default async function createTable({
    dbFullName,
    tableName,
    tableInfoArray,
-    dbSchema,
-    clone,
    tableSchema,
    recordedDbEntry,
 }: Param) {
@@ -40,7 +36,9 @@ export default async function createTable({
     */
    const createTableQueryArray = [];

-    createTableQueryArray.push(`CREATE TABLE IF NOT EXISTS \`${tableName}\` (`);
+    createTableQueryArray.push(
+        `CREATE TABLE IF NOT EXISTS \`${dbFullName}\`.\`${tableName}\` (`
+    );

    ////////////////////////////////////////
    ////////////////////////////////////////
@@ -52,8 +50,7 @@ export default async function createTable({
        }

        const existingTable = await varDatabaseDbHandler({
-            database: "datasquirel",
-            queryString: `SELECT * FROM user_database_tables WHERE db_id = ? AND table_slug = ?`,
+            queryString: `SELECT * FROM datasquirel.user_database_tables WHERE db_id = ? AND table_slug = ?`,
            queryValuesArray: [recordedDbEntry.id, tableSchema?.tableName],
        });

@@ -63,7 +60,7 @@ export default async function createTable({

        if (!table?.id) {
            const newTableEntry = await dbHandler({
-                query: `INSERT INTO user_database_tables SET ?`,
+                query: `INSERT INTO datasquirel.user_database_tables SET ?`,
                values: {
                    user_id: recordedDbEntry.user_id,
                    db_id: recordedDbEntry.id,
@@ -80,7 +77,6 @@ export default async function createTable({
                    date_updated: Date(),
                    date_updated_code: Date.now(),
                },
-                database: "datasquirel",
            });
        }
    } catch (error) {}
@@ -150,10 +146,6 @@ export default async function createTable({
        ////////////////////////////////////////
    }

-    ////////////////////////////////////////
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-
    if (foreignKeys[0]) {
        foreignKeys.forEach((foreighKey, index, array) => {
            const fieldName = foreighKey.fieldName;
@@ -190,18 +182,7 @@ export default async function createTable({

    const newTable = await varDatabaseDbHandler({
        queryString: createTableQuery,
-        database: dbFullName,
    });

    return newTable;
-
-    ////////////////////////////////////////
-    ////////////////////////////////////////
-    ////////////////////////////////////////
 }
-
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
-/** ****************************************************************************** */
@@ -4,79 +4,29 @@ import path from "path";
 import mysql from "serverless-mysql";
 import grabDbSSL from "../../utils/backend/grabDbSSL";

-let connection = mysql({
-    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: grabDbSSL(),
-    },
-});
-
 type Param = {
    query: string;
    values?: string[] | object;
-    database?: string;
 };

 /**
 * # Main DB Handler Function
+ * @requires DSQL_DB_CONN - Gobal Variable for Datasquirel Database
 */
 export default async function dbHandler({
    query,
    values,
-    database,
 }: Param): Promise<any[] | object | null> {
-    /**
-     * Switch Database
-     *
-     * @description If a database is provided, switch to it
-     */
-    let isDbCorrect = true;
+    let connection = global.DSQL_DB_CONN;

-    if (database) {
-        connection = mysql({
-            config: {
-                host: process.env.DSQL_DB_HOST,
-                user: process.env.DSQL_DB_USERNAME,
-                password: process.env.DSQL_DB_PASSWORD,
-                database: database,
-                charset: "utf8mb4",
-                ssl: grabDbSSL(),
-            },
-        });
-    }
-
-    if (!isDbCorrect) {
-        console.log(
-            "Shell Db Handler ERROR in switching Database! Operation Failed!"
-        );
-        return null;
-    }
-
-    /**
-     * Declare variables
-     *
-     * @description Declare "results" variable
-     */
    let results;

-    /**
-     * Fetch from db
-     *
-     * @description Fetch data from db if no cache
-     */
    try {
        if (query && values) {
            results = await connection.query(query, values);
        } else {
            results = await connection.query(query);
        }
-
-        /** ********************* Clean up */
-        await connection.end();
    } catch (/** @type {any} */ error: any) {
        if (process.env.FIRST_RUN) {
            return null;
@@ -92,13 +42,10 @@ export default async function dbHandler({
            "utf8"
        );
        results = null;
+    } finally {
+        await connection?.end();
    }

-    /**
-     * Return results
-     *
-     * @description Return results add to cache if "req" param is passed
-     */
    if (results) {
        return JSON.parse(JSON.stringify(results));
    } else {
@@ -75,7 +75,9 @@ export default async function updateTable({
        /**
         * @description Push the query initial value
         */
-        updateTableQueryArray.push(`ALTER TABLE \`${tableName}\``);
+        updateTableQueryArray.push(
+            `ALTER TABLE \`${dbFullName}\`.\`${tableName}\``
+        );

        if (childDb) {
            try {
@@ -84,8 +86,7 @@ export default async function updateTable({
                }

                const existingTable = await varDatabaseDbHandler({
-                    database: "datasquirel",
-                    queryString: `SELECT * FROM user_database_tables WHERE db_id = ? AND table_slug = ?`,
+                    queryString: `SELECT * FROM datasquirel.user_database_tables WHERE db_id = ? AND table_slug = ?`,
                    queryValuesArray: [recordedDbEntry.id, tableName],
                });

@@ -95,7 +96,7 @@ export default async function updateTable({

                if (!table?.id) {
                    const newTableEntry = await dbHandler({
-                        query: `INSERT INTO user_database_tables SET ?`,
+                        query: `INSERT INTO datasquirel.user_database_tables SET ?`,
                        values: {
                            user_id: recordedDbEntry.user_id,
                            db_id: recordedDbEntry.id,
@@ -112,7 +113,6 @@ export default async function updateTable({
                            date_updated: Date(),
                            date_updated_code: Date.now(),
                        },
-                        database: "datasquirel",
                    });
                }
            } catch (error) {}
@@ -124,8 +124,7 @@ export default async function updateTable({
         */ // @ts-ignore
        const allExistingIndexes: import("../../types").DSQL_MYSQL_SHOW_INDEXES_Type[] =
            await varDatabaseDbHandler({
-                queryString: `SHOW INDEXES FROM \`${tableName}\``,
-                database: dbFullName,
+                queryString: `SHOW INDEXES FROM \`${dbFullName}\`.\`${tableName}\``,
            });

        /**
@@ -134,8 +133,7 @@ export default async function updateTable({
         */ // @ts-ignore
        const allExistingColumns: import("../../types").DSQL_MYSQL_SHOW_COLUMNS_Type[] =
            await varDatabaseDbHandler({
-                queryString: `SHOW COLUMNS FROM \`${tableName}\``,
-                database: dbFullName,
+                queryString: `SHOW COLUMNS FROM \`${dbFullName}\`.\`${tableName}\``,
            });

        ////////////////////////////////////////
@@ -174,8 +172,7 @@ export default async function updateTable({
                    updatedColumnsArray.push(existingEntry[0].fieldName);

                    const renameColumn = await varDatabaseDbHandler({
-                        queryString: `ALTER TABLE ${tableName} RENAME COLUMN \`${existingEntry[0].originName}\` TO \`${existingEntry[0].fieldName}\``,
-                        database: dbFullName,
+                        queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` RENAME COLUMN \`${existingEntry[0].originName}\` TO \`${existingEntry[0].fieldName}\``,
                    });

                    console.log(
@@ -241,8 +238,7 @@ export default async function updateTable({
                ////////////////////////////////////////
            } else {
                await varDatabaseDbHandler({
-                    queryString: `ALTER TABLE ${tableName} DROP COLUMN \`${Field}\``,
-                    database: dbFullName,
+                    queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP COLUMN \`${Field}\``,
                });
            }
        }
@@ -275,8 +271,7 @@ export default async function updateTable({
                     * present in the datasquirel DB schema
                     */
                    await varDatabaseDbHandler({
-                        queryString: `ALTER TABLE ${tableName} DROP INDEX \`${Key_name}\``,
-                        database: dbFullName,
+                        queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP INDEX \`${Key_name}\``,
                    });
                }
            }
@@ -312,11 +307,10 @@ export default async function updateTable({
                    await varDatabaseDbHandler({
                        queryString: `CREATE${
                            indexType?.match(/fullText/i) ? " FULLTEXT" : ""
-                        } INDEX \`${alias}\` ON ${tableName}(${indexTableFields
+                        } INDEX \`${alias}\` ON \`${dbFullName}\`.\`${tableName}\`(${indexTableFields
                            ?.map((nm) => nm.value)
                            .map((nm) => `\`${nm}\``)
                            .join(",")}) COMMENT 'schema_index'`,
-                        database: dbFullName,
                    });
                }
            }
@@ -332,12 +326,11 @@ export default async function updateTable({
        /**
         *  @description All MSQL Foreign Keys
         * @type {import("../../types").DSQL_MYSQL_FOREIGN_KEYS_Type[] | null}
-         */ // @ts-ignore
+         */
        const allForeignKeys:
            | import("../../types").DSQL_MYSQL_FOREIGN_KEYS_Type[]
            | null = await varDatabaseDbHandler({
            queryString: `SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE CONSTRAINT_SCHEMA = '${dbFullName}' AND TABLE_NAME='${tableName}' AND CONSTRAINT_TYPE='FOREIGN KEY'`,
-            database: dbFullName,
        });

        if (allForeignKeys) {
@@ -354,8 +347,7 @@ export default async function updateTable({
                 * Foreign keys
                 */
                const dropForeignKey = await varDatabaseDbHandler({
-                    queryString: `ALTER TABLE ${tableName} DROP FOREIGN KEY \`${CONSTRAINT_NAME}\``,
-                    database: dbFullName,
+                    queryString: `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` DROP FOREIGN KEY \`${CONSTRAINT_NAME}\``,
                });
            }
        }
@@ -500,10 +492,9 @@ export default async function updateTable({
                }${cascadeUpdate ? " ON UPDATE CASCADE" : ""}`;
                // const foreinKeyText = `ADD CONSTRAINT \`${foreignKeyName}\` FOREIGN KEY (${fieldName}) REFERENCES ${destinationTableName}(${destinationTableColumnName})${cascadeDelete ? " ON DELETE CASCADE" : ""}${cascadeUpdate ? " ON UPDATE CASCADE" : ""}` + ",";

-                const finalQueryString = `ALTER TABLE \`${tableName}\` ${foreinKeyText}`;
+                const finalQueryString = `ALTER TABLE \`${dbFullName}\`.\`${tableName}\` ${foreinKeyText}`;

                const addForeignKey = await varDatabaseDbHandler({
-                    database: dbFullName,
                    queryString: finalQueryString,
                });

@@ -533,7 +524,6 @@ export default async function updateTable({
        if (updateTableQueryArray.length > 1) {
            const updateTable = await varDatabaseDbHandler({
                queryString: updateTableQuery,
-                database: dbFullName,
            });

            return updateTable;
@@ -4,8 +4,6 @@ import { DSQL_TableSchemaType } from "../../types";
 type Param = {
    queryString: string;
    queryValuesArray?: string[];
-    database?: string;
-    tableSchema?: DSQL_TableSchemaType;
 };

 /**
@@ -14,8 +12,6 @@ type Param = {
 export default async function varDatabaseDbHandler({
    queryString,
    queryValuesArray,
-    database,
-    tableSchema,
 }: Param): Promise<any> {
    /**
     * Declare variables
@@ -39,12 +35,10 @@ export default async function varDatabaseDbHandler({
            results = await dbHandler({
                query: queryString,
                values: queryValuesArray,
-                database,
            });
        } else {
            results = await dbHandler({
                query: queryString,
-                database,
            });
        }