Updates

package-shared/functions/backend/db/addDbEntry.ts

@@ -72,13 +72,6 @@ export default async function addDbEntry<
         });
     }
 
-    const DB_CONN = isMaster
-        ? global.DSQL_DB_CONN
-        : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-    const DB_RO_CONN = isMaster
-        ? global.DSQL_DB_CONN
-        : global.DSQL_READ_ONLY_DB_CONN || global.DSQL_DB_CONN;
-
     let newData = _.cloneDeep(data);
     if (newData) {
         newData = purgeDefaultFields(newData);
@@ -98,11 +91,9 @@ export default async function addDbEntry<
             isMaster ? "" : `\`${dbFullName}\`.`
         }\`${tableName}\` WHERE \`${duplicateColumnName}\`=?`;
 
-        const duplicateValue = await connDbHandler(
-            DB_RO_CONN,
-            checkDuplicateQuery,
-            [duplicateColumnValue]
-        );
+        const duplicateValue = await connDbHandler(null, checkDuplicateQuery, [
+            duplicateColumnValue,
+        ]);
 
         if (duplicateValue?.[0] && !update) {
             return {
@@ -200,10 +191,6 @@ export default async function addDbEntry<
                     "DSQL: Error in parsing data keys =>",
                     error.message
                 );
-                global.ERROR_CALLBACK?.(
-                    `Error parsing Data Keys`,
-                    error as Error
-                );
                 continue;
             }
         }
@@ -236,7 +223,7 @@ export default async function addDbEntry<
         )}) VALUES (${insertValuesArray.map(() => "?").join(",")})`;
 
         const newInsert = await connDbHandler(
-            DB_CONN,
+            null,
             query,
             queryValuesArray,
             debug
@@ -280,7 +267,7 @@ export default async function addDbEntry<
         console.log("batchQueryValuesArray", batchQueryValuesArray);
 
         const newInsert = await connDbHandler(
-            DB_CONN,
+            null,
             query,
             batchQueryValuesArray.flat(),
             debug

package-shared/functions/backend/db/deleteDbEntry.ts

@@ -33,10 +33,6 @@ export default async function deleteDbEntry<
             ? true
             : checkIfIsMaster({ dbContext, dbFullName });
 
-        const DB_CONN = isMaster
-            ? global.DSQL_DB_CONN
-            : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-
         /**
          * Execution
          *
@@ -46,7 +42,7 @@ export default async function deleteDbEntry<
             isMaster && !dbFullName ? "" : `\`${dbFullName}\`.`
         }\`${tableName}\` WHERE \`${identifierColumnName.toString()}\`=?`;
 
-        const deletedEntry = await connDbHandler(DB_CONN, query, [
+        const deletedEntry = await connDbHandler(null, query, [
             identifierValue,
         ]);
 
@@ -54,8 +50,8 @@ export default async function deleteDbEntry<
          * Return statement
          */
         return deletedEntry;
-    } catch (error) {
-        global.ERROR_CALLBACK?.(`Error Deleting Entry`, error as Error);
+    } catch (error: any) {
+        console.log("Error Deleting Entry =>", error.message);
         return null;
     }
 }

package-shared/functions/backend/db/runQuery.ts

@@ -1,5 +1,5 @@
 import fullAccessDbHandler from "../fullAccessDbHandler";
-import varReadOnlyDatabaseDbHandler from "../varReadOnlyDatabaseDbHandler";
+import dbHandler from "../dbHandler";
 import serverError from "../serverError";
 import addDbEntry from "./addDbEntry";
 import updateDbEntry from "./updateDbEntry";
@@ -18,7 +18,6 @@ type Param = {
     dbSchema?: import("../../../types").DSQL_DatabaseSchemaType;
     queryValuesArray?: (string | number)[];
     tableName?: string;
-    forceLocal?: boolean;
 };
 
 type Return = {
@@ -38,7 +37,6 @@ export default async function runQuery({
     tableName,
     debug,
     dbContext,
-    forceLocal,
 }: Param): Promise<Return> {
     /**
      * Declare variables
@@ -77,7 +75,7 @@ export default async function runQuery({
         if (typeof query === "string") {
             const formattedQuery = trimSql(query);
 
-            if (debug && global.DSQL_USE_LOCAL) {
+            if (debug) {
                 console.log("runQuery:formattedQuery", formattedQuery);
             }
 
@@ -91,18 +89,15 @@ export default async function runQuery({
             }
 
             if (readOnly) {
-                result = await varReadOnlyDatabaseDbHandler({
-                    queryString: formattedQuery,
-                    queryValuesArray: queryValuesArray?.map((vl) => String(vl)),
-                    tableSchema,
-                    forceLocal,
+                result = await dbHandler({
+                    query: formattedQuery,
+                    values: queryValuesArray?.map((vl) => String(vl)),
                 });
             } else {
                 result = await fullAccessDbHandler({
                     queryString: formattedQuery,
                     queryValuesArray: queryValuesArray?.map((vl) => String(vl)),
                     tableSchema,
-                    forceLocal,
                 });
             }
         } else if (typeof query === "object") {
@@ -178,7 +173,7 @@ export default async function runQuery({
             message: err.message,
         });
 
-        if (debug && global.DSQL_USE_LOCAL) {
+        if (debug) {
             console.log("runQuery:error", err.message);
         }
 

package-shared/functions/backend/db/updateDbEntry.ts

@@ -60,10 +60,6 @@ export default async function updateDbEntry<
         ? true
         : checkIfIsMaster({ dbContext, dbFullName });
 
-    const DB_CONN = isMaster
-        ? global.DSQL_DB_CONN
-        : global.DSQL_FULL_ACCESS_DB_CONN || global.DSQL_DB_CONN;
-
     ////////////////////////////////////////
     ////////////////////////////////////////
     ////////////////////////////////////////
@@ -182,7 +178,7 @@ export default async function updateDbEntry<
 
     updateValues.push(identifierValue);
 
-    const updatedEntry = await connDbHandler(DB_CONN, query, updateValues);
+    const updatedEntry = await connDbHandler(null, query, updateValues);
 
     /**
      * Return statement