From 57f06a631f336840fd10cccc27717153155fda5f Mon Sep 17 00:00:00 2001
From: Benjamin Toby <devops@tben.me>
Date: Wed, 3 Dec 2025 21:31:18 +0100
Subject: [PATCH] Updates

---
 .../functions/dsql/sql/sql-generator.js              |  5 +++--
 dist/package-shared/types/index.d.ts                 |  2 ++
 package-shared/functions/dsql/sql/sql-generator.ts   | 12 ++++++++++--
 package-shared/types/index.ts                        |  2 ++
 package.json                                         |  2 +-
 5 files changed, 18 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 465f913..74615e7 100644
--- a/dist/package-shared/functions/dsql/sql/sql-generator.js
+++ b/dist/package-shared/functions/dsql/sql/sql-generator.js
@@ -142,12 +142,13 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
             let countSqls = [];
             for (let i = 0; i < genObject.countSubQueries.length; i++) {
                 const countSubQuery = genObject.countSubQueries[i];
+                const tableAlias = countSubQuery.table_alias;
                 let subQStr = `(SELECT COUNT(*)`;
-                subQStr += ` FROM ${countSubQuery.table}`;
+                subQStr += ` FROM ${countSubQuery.table}${tableAlias ? ` ${tableAlias}` : ""}`;
                 subQStr += ` WHERE (`;
                 for (let j = 0; j < countSubQuery.srcTrgMap.length; j++) {
                     const csqSrc = countSubQuery.srcTrgMap[j];
-                    subQStr += ` ${countSubQuery.table}.${csqSrc.src}`;
+                    subQStr += ` ${tableAlias || countSubQuery.table}.${csqSrc.src}`;
                     if (typeof csqSrc.trg == "string") {
                         subQStr += ` = ?`;
                         sqlSearhValues.push(csqSrc.trg);
diff --git a/dist/package-shared/types/index.d.ts b/dist/package-shared/types/index.d.ts
index 2cb34a7..17a749b 100644
--- a/dist/package-shared/types/index.d.ts
+++ b/dist/package-shared/types/index.d.ts
@@ -846,6 +846,8 @@ export type ServerQueryParamFullTextSearch<T extends {
 };
 export type ServerQueryParamsCount = {
     table: string;
+    /** Alias for the Table From which the count is fetched */
+    table_alias?: string;
     srcTrgMap: {
         src: string;
         trg: string | ServerQueryParamsCountSrcTrgMap;
diff --git a/package-shared/functions/dsql/sql/sql-generator.ts b/package-shared/functions/dsql/sql/sql-generator.ts
index 82e9f89..c98a189 100644
--- a/package-shared/functions/dsql/sql/sql-generator.ts
+++ b/package-shared/functions/dsql/sql/sql-generator.ts
@@ -205,13 +205,21 @@ export default function sqlGenerator<
 
             for (let i = 0; i < genObject.countSubQueries.length; i++) {
                 const countSubQuery = genObject.countSubQueries[i];
+                const tableAlias = countSubQuery.table_alias;
+
                 let subQStr = `(SELECT COUNT(*)`;
-                subQStr += ` FROM ${countSubQuery.table}`;
+
+                subQStr += ` FROM ${countSubQuery.table}${
+                    tableAlias ? ` ${tableAlias}` : ""
+                }`;
+
                 subQStr += ` WHERE (`;
 
                 for (let j = 0; j < countSubQuery.srcTrgMap.length; j++) {
                     const csqSrc = countSubQuery.srcTrgMap[j];
-                    subQStr += ` ${countSubQuery.table}.${csqSrc.src}`;
+                    subQStr += ` ${tableAlias || countSubQuery.table}.${
+                        csqSrc.src
+                    }`;
 
                     if (typeof csqSrc.trg == "string") {
                         subQStr += ` = ?`;
diff --git a/package-shared/types/index.ts b/package-shared/types/index.ts
index 1f30b5a..9344cab 100644
--- a/package-shared/types/index.ts
+++ b/package-shared/types/index.ts
@@ -1035,6 +1035,8 @@ export type ServerQueryParamFullTextSearch<
 
 export type ServerQueryParamsCount = {
     table: string;
+    /** Alias for the Table From which the count is fetched */
+    table_alias?: string;
     srcTrgMap: {
         src: string;
         trg: string | ServerQueryParamsCountSrcTrgMap;
diff --git a/package.json b/package.json
index b54d242..ea3a9b5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@moduletrace/datasquirel",
-    "version": "5.5.0",
+    "version": "5.5.1",
     "description": "Cloud-based SQL data management tool",
     "main": "dist/index.js",
     "bin": {