From b81948d2c10451d58696f18139462678bfd2353d Mon Sep 17 00:00:00 2001 From: Benjamin Toby Date: Sun, 21 Sep 2025 09:10:33 +0100 Subject: [PATCH] Updates --- dist/package-shared/functions/dsql/sql/sql-generator.js | 9 +++------ package-shared/functions/dsql/sql/sql-generator.ts | 9 +++------ package.json | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dist/package-shared/functions/dsql/sql/sql-generator.js b/dist/package-shared/functions/dsql/sql/sql-generator.js index ec916b1..6b63583 100644 --- a/dist/package-shared/functions/dsql/sql/sql-generator.js +++ b/dist/package-shared/functions/dsql/sql/sql-generator.js @@ -149,16 +149,13 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) { if (genObject.join) { str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => typeof fld == "object" ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` + - fld.alias - ? ` as ${fld.alias}` - : `` + (fld.alias ? ` as ${fld.alias}` : ``) : `${finalDbName}${tableName}.${String(fld)}`).join(",")}`; } else { str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.map((fld) => typeof fld == "object" - ? `${fld.fieldName.toString()}` + fld.alias - ? ` as ${fld.alias}` - : `` + ? `${fld.fieldName.toString()}` + + (fld.alias ? ` as ${fld.alias}` : ``) : fld).join(",")}`; } } diff --git a/package-shared/functions/dsql/sql/sql-generator.ts b/package-shared/functions/dsql/sql/sql-generator.ts index 4910651..c97698f 100644 --- a/package-shared/functions/dsql/sql/sql-generator.ts +++ b/package-shared/functions/dsql/sql/sql-generator.ts @@ -211,9 +211,7 @@ export default function sqlGenerator< ?.map((fld) => typeof fld == "object" ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` + - fld.alias - ? ` as ${fld.alias}` - : `` + (fld.alias ? ` as ${fld.alias}` : ``) : `${finalDbName}${tableName}.${String(fld)}` ) .join(",")}`; @@ -221,9 +219,8 @@ export default function sqlGenerator< str += ` ${genObject.selectFields ?.map((fld) => typeof fld == "object" - ? `${fld.fieldName.toString()}` + fld.alias - ? ` as ${fld.alias}` - : `` + ? `${fld.fieldName.toString()}` + + (fld.alias ? ` as ${fld.alias}` : ``) : fld ) .join(",")}`; diff --git a/package.json b/package.json index c6815ae..6ac9ff8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/datasquirel", - "version": "5.3.1", + "version": "5.3.2", "description": "Cloud-based SQL data management tool", "main": "dist/index.js", "bin": {