From 9402c859f7fd28c0689b9b7ea2adf5533880a199 Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Mon, 5 Jan 2026 14:11:17 +0100
Subject: [PATCH] Updates

---
 dist/package-shared/functions/dsql/sql/sql-generator.js | 8 ++++++--
 dist/package-shared/types/index.d.ts                    | 5 +++++
 package-shared/functions/dsql/sql/sql-generator.ts      | 8 ++++++--
 package-shared/types/index.ts                           | 5 +++++
 package.json                                            | 2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/dist/package-shared/functions/dsql/sql/sql-generator.js b/dist/package-shared/functions/dsql/sql/sql-generator.js
index 3424d3d..717bf10 100644
--- a/dist/package-shared/functions/dsql/sql/sql-generator.js
+++ b/dist/package-shared/functions/dsql/sql/sql-generator.js
@@ -256,7 +256,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
                 const newSubQueryObj = subQueryGroup === null || subQueryGroup === void 0 ? void 0 : subQueryGroup[_field];
                 return genSqlSrchStr({
                     queryObj: newSubQueryObj,
-                    field: _field,
+                    field: newSubQueryObj.fieldName || _field,
                     join: genObject === null || genObject === void 0 ? void 0 : genObject.join,
                 });
             });
@@ -264,7 +264,11 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
                 subSearchString.join(` ${queryObj.operator || "AND"} `) +
                 ")");
         }
-        return genSqlSrchStr({ queryObj, field, join: genObject === null || genObject === void 0 ? void 0 : genObject.join });
+        return genSqlSrchStr({
+            queryObj,
+            field: queryObj.fieldName || field,
+            join: genObject === null || genObject === void 0 ? void 0 : genObject.join,
+        });
     });
     const cleanedUpSearchStr = sqlSearhString === null || sqlSearhString === void 0 ? void 0 : sqlSearhString.filter((str) => typeof str == "string");
     const isSearchStr = (cleanedUpSearchStr === null || cleanedUpSearchStr === void 0 ? void 0 : cleanedUpSearchStr[0]) && cleanedUpSearchStr.find((str) => str);
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index ef37a55..c63d6ef 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -910,6 +910,11 @@ export type ServerQueryObject<T extends object = {
     operator?: (typeof ServerQueryOperators)[number];
     equality?: (typeof ServerQueryEqualities)[number];
     tableName?: K;
+    /**
+     * This will replace the top level field name if
+     * provided
+     */
+    fieldName?: string;
     __query?: {
         [key in keyof T]: Omit<ServerQueryObject<T>, "__query">;
     };
diff --git a/package-shared/functions/dsql/sql/sql-generator.ts b/package-shared/functions/dsql/sql/sql-generator.ts
index daa80d4..11c9b3a 100644
--- a/package-shared/functions/dsql/sql/sql-generator.ts
+++ b/package-shared/functions/dsql/sql/sql-generator.ts
@@ -349,7 +349,7 @@ export default function sqlGenerator<
 
                 return genSqlSrchStr({
                     queryObj: newSubQueryObj,
-                    field: _field,
+                    field: newSubQueryObj.fieldName || _field,
                     join: genObject?.join,
                 });
             });
@@ -361,7 +361,11 @@ export default function sqlGenerator<
             );
         }
 
-        return genSqlSrchStr({ queryObj, field, join: genObject?.join });
+        return genSqlSrchStr({
+            queryObj,
+            field: queryObj.fieldName || field,
+            join: genObject?.join,
+        });
     });
 
     const cleanedUpSearchStr = sqlSearhString?.filter(
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index b55d0b9..0f333c5 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -1108,6 +1108,11 @@ export type ServerQueryObject<
     operator?: (typeof ServerQueryOperators)[number];
     equality?: (typeof ServerQueryEqualities)[number];
     tableName?: K;
+    /**
+     * This will replace the top level field name if
+     * provided
+     */
+    fieldName?: string;
     __query?: {
         [key in keyof T]: Omit<ServerQueryObject<T>, "__query">;
     };
diff --git a/package.json b/package.json
index d215f0b..0673bbe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.7.20",
+    "version": "5.7.21",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {