Updates

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

@@ -125,6 +125,13 @@ export default async function <
     return {
         success: isSuccess,
         payload: isSuccess ? (countOnly ? null : parsedRes) : null,
+        singleRes: isSuccess
+            ? countOnly
+                ? null
+                : Array.isArray(parsedRes) && parsedRes.length == 1
+                ? parsedRes[0]
+                : null
+            : null,
         batchPayload: isSuccess ? (countOnly ? null : parsedBatchRes) : null,
         error: isSuccess
             ? undefined

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

@@ -48,7 +48,9 @@ export default async function dsqlCrud<
           })
         : undefined;
 
-    const whereClause = queryObject?.string.replace(/^.*?( WHERE )/, "$1");
+    const whereClause = queryObject?.string?.match(/ WHERE /)
+        ? queryObject.string.replace(/^.*?( WHERE )/, "$1")
+        : undefined;
 
     const whereClauseObject = whereClause
         ? {