Moduletrace/datasquirel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
archben 2025-09-21 09:02:19 +01:00
parent d646b4e93a
commit 0fcd92ab3e
7 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
bun.lockb Executable file → Normal file
View File

13
dist/package-shared/functions/dsql/sql/sql-generator.js vendored
View File

@ -147,10 +147,19 @@ 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]) {
if (genObject.join) {
str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => `${finalDbName}${tableName}.${String(fld)}`).join(",")}`;
str += ` ${(_b = genObject.selectFields) === null || _b === void 0 ? void 0 : _b.map((fld) => typeof fld == "object"
? `${finalDbName}${tableName}.${fld.fieldName}` +
fld.alias
? ` as ${fld.alias}`
: ``
: `${finalDbName}${tableName}.${String(fld)}`).join(",")}`;
}
else {
str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.join(",")}`;
str += ` ${(_c = genObject.selectFields) === null || _c === void 0 ? void 0 : _c.map((fld) => typeof fld == "object"
? `${fld.fieldName}` + fld.alias
? ` as ${fld.alias}`
: ``
: fld).join(",")}`;
}
}
else {

10
dist/package-shared/types/index.d.ts vendored
View File

@ -810,7 +810,7 @@ export type ServerQueryParam<T extends {
} = {
[k: string]: any;
}, K extends string = string> = {
selectFields?: (keyof T)[];
selectFields?: (keyof T | TableSelectFieldsObject)[];
omitFields?: (keyof T)[];
query?: ServerQueryQueryObject<T>;
limit?: number;
@ -829,6 +829,14 @@ export type ServerQueryParam<T extends {
group?: (keyof T)[];
[key: string]: any;
};
export type TableSelectFieldsObject<T extends {
[k: string]: any;
} = {
[k: string]: any;
}> = {
fieldName: keyof T;
alias?: string;
};
export type ServerQueryValuesObject = {
value?: string | number;
equality?: (typeof ServerQueryEqualities)[number];

19
package-shared/functions/dsql/sql/sql-generator.ts
View File

@ -208,10 +208,25 @@ export default function sqlGenerator<
} else if (genObject?.selectFields?.[0]) {
if (genObject.join) {
str += ` ${genObject.selectFields
?.map((fld) => `${finalDbName}${tableName}.${String(fld)}`)
?.map((fld) =>
typeof fld == "object"
? `${finalDbName}${tableName}.${fld.fieldName}` +
fld.alias
? ` as ${fld.alias}`
: ``
: `${finalDbName}${tableName}.${String(fld)}`
)
.join(",")}`;
} else {
str += ` ${genObject.selectFields?.join(",")}`;
str += ` ${genObject.selectFields
?.map((fld) =>
typeof fld == "object"
? `${fld.fieldName}` + fld.alias
? ` as ${fld.alias}`
: ``
: fld
)
.join(",")}`;
}
} else {
if (genObject?.join) {

9
package-shared/types/index.ts
View File

@ -995,7 +995,7 @@ export type ServerQueryParam<
T extends { [k: string]: any } = { [k: string]: any },
K extends string = string
> = {
selectFields?: (keyof T)[];
selectFields?: (keyof T | TableSelectFieldsObject)[];
omitFields?: (keyof T)[];
query?: ServerQueryQueryObject<T>;
limit?: number;
@ -1015,6 +1015,13 @@ export type ServerQueryParam<
[key: string]: any;
};
export type TableSelectFieldsObject<
T extends { [k: string]: any } = { [k: string]: any }
> = {
fieldName: keyof T;
alias?: string;
};
export type ServerQueryValuesObject = {
value?: string | number;
equality?: (typeof ServerQueryEqualities)[number];

1
package-shared/utils/grab-instance-global-network-name.ts
View File

@ -1,5 +1,4 @@
import _ from "lodash";
import grabIPAddresses from "./backend/names/grab-ip-addresses";
export default function grabInstanceGlobalNetWorkName() {
const deploymentName = process.env.DSQL_DEPLOYMENT_NAME || "dsql";

2
package.json
View File

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