This commit is contained in:
archben 2025-09-21 09:04:58 +01:00
parent 0fcd92ab3e
commit 557bbb30bd
5 changed files with 7 additions and 7 deletions

View File

@ -148,7 +148,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
else if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) { else if ((_a = genObject === null || genObject === void 0 ? void 0 : genObject.selectFields) === null || _a === void 0 ? void 0 : _a[0]) {
if (genObject.join) { if (genObject.join) {
str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => typeof fld == "object" str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => typeof fld == "object"
? `${finalDbName}${tableName}.${fld.fieldName}` + ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` +
fld.alias fld.alias
? ` as ${fld.alias}` ? ` as ${fld.alias}`
: `` : ``
@ -156,7 +156,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
} }
else { else {
str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.map((fld) => typeof fld == "object" str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.map((fld) => typeof fld == "object"
? `${fld.fieldName}` + fld.alias ? `${fld.fieldName.toString()}` + fld.alias
? ` as ${fld.alias}` ? ` as ${fld.alias}`
: `` : ``
: fld).join(",")}`; : fld).join(",")}`;

View File

@ -810,7 +810,7 @@ export type ServerQueryParam<T extends {
} = { } = {
[k: string]: any; [k: string]: any;
}, K extends string = string> = { }, K extends string = string> = {
selectFields?: (keyof T | TableSelectFieldsObject)[]; selectFields?: (keyof T | TableSelectFieldsObject<T>)[];
omitFields?: (keyof T)[]; omitFields?: (keyof T)[];
query?: ServerQueryQueryObject<T>; query?: ServerQueryQueryObject<T>;
limit?: number; limit?: number;

View File

@ -210,7 +210,7 @@ export default function sqlGenerator<
str += ` ${genObject.selectFields str += ` ${genObject.selectFields
?.map((fld) => ?.map((fld) =>
typeof fld == "object" typeof fld == "object"
? `${finalDbName}${tableName}.${fld.fieldName}` + ? `${finalDbName}${tableName}.${fld.fieldName.toString()}` +
fld.alias fld.alias
? ` as ${fld.alias}` ? ` as ${fld.alias}`
: `` : ``
@ -221,7 +221,7 @@ export default function sqlGenerator<
str += ` ${genObject.selectFields str += ` ${genObject.selectFields
?.map((fld) => ?.map((fld) =>
typeof fld == "object" typeof fld == "object"
? `${fld.fieldName}` + fld.alias ? `${fld.fieldName.toString()}` + fld.alias
? ` as ${fld.alias}` ? ` as ${fld.alias}`
: `` : ``
: fld : fld

View File

@ -995,7 +995,7 @@ export type ServerQueryParam<
T extends { [k: string]: any } = { [k: string]: any }, T extends { [k: string]: any } = { [k: string]: any },
K extends string = string K extends string = string
> = { > = {
selectFields?: (keyof T | TableSelectFieldsObject)[]; selectFields?: (keyof T | TableSelectFieldsObject<T>)[];
omitFields?: (keyof T)[]; omitFields?: (keyof T)[];
query?: ServerQueryQueryObject<T>; query?: ServerQueryQueryObject<T>;
limit?: number; limit?: number;

View File

@ -1,6 +1,6 @@
{ {
"name": "@moduletrace/datasquirel", "name": "@moduletrace/datasquirel",
"version": "5.3.0", "version": "5.3.1",
"description": "Cloud-based SQL data management tool", "description": "Cloud-based SQL data management tool",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {