Updates

package-shared/utils/data-fetching/crud-get.ts

@@ -1,6 +1,8 @@
 import sqlGenerator from "../../functions/dsql/sql/sql-generator";
 import { APIResponseObject, DsqlCrudParam } from "../../types";
 import connDbHandler, { ConnDBHandlerQueryObject } from "../db/conn-db-handler";
+import checkArrayDepth from "../check-array-depth";
+import parseDbResults from "../../functions/backend/parseDbResults";
 
 export default async function <
     T extends { [key: string]: any } = { [key: string]: any }
@@ -10,6 +12,7 @@ export default async function <
     count,
     countOnly,
     dbFullName,
+    tableSchema,
 }: Omit<
     DsqlCrudParam<T>,
     "action" | "data" | "sanitize"
@@ -55,13 +58,26 @@ export default async function <
 
     const res = await connDbHandler(undefined, connQueries);
 
+    const parsedRes = checkArrayDepth(res, 2)
+        ? parseDbResults({ unparsedResults: res[0], tableSchema })
+        : res[0];
+    const parsedBatchRes = checkArrayDepth(res, 3)
+        ? res.map((_r: any[][]) => {
+              return parseDbResults({ unparsedResults: _r[0], tableSchema });
+          })
+        : res;
+
     const isSuccess = Array.isArray(res) && Array.isArray(res[0]);
 
     return {
         success: isSuccess,
-        payload: isSuccess ? (countOnly ? null : res[0]) : null,
-        batchPayload: isSuccess ? (countOnly ? null : res) : null,
-        error: isSuccess ? undefined : res?.error,
+        payload: isSuccess ? (countOnly ? null : parsedRes) : null,
+        batchPayload: isSuccess ? (countOnly ? null : parsedBatchRes) : null,
+        error: isSuccess
+            ? undefined
+            : typeof res == "object" && !Array.isArray(res)
+            ? res?.error
+            : undefined,
         errors: res?.errors,
         queryObject: {
             sql: queryObject?.string,

package-shared/utils/data-fetching/crud.ts

@@ -26,6 +26,7 @@ export default async function dsqlCrud<
         batchData,
         deleteKeyValues,
         debug,
+        tableSchema,
     } = params;
 
     const finalData = (sanitize ? sanitize({ data }) : data) as T;
@@ -47,6 +48,7 @@ export default async function dsqlCrud<
                 tableName: table,
                 dbFullName,
                 debug,
+                tableSchema,
             });
             return INSERT_RESULT;
 
@@ -60,6 +62,7 @@ export default async function dsqlCrud<
                 identifierColumnName: (targetField || "id") as string,
                 identifierValue: String(targetValue || targetId),
                 debug,
+                tableSchema,
             });
 
             return UPDATE_RESULT;