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

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2026-01-05 13:40:23 +01:00
parent 18e29fa413
commit 8bcb35a8f0
7 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/package-shared/api-paths/utils/checks.js vendored
View File

@ -53,6 +53,8 @@ function checks(_a) {
if ((_e = newQuery === null || newQuery === void 0 ? void 0 : newQuery.searchQuery) === null || _e === void 0 ? void 0 : _e.join) {
for (let i = 0; i < newQuery.searchQuery.join.length; i++) {
const join = newQuery.searchQuery.join[i];
if (!join)
continue;
const joinTableName = join.tableName;
const selectFields = join.selectFields;
if (allowedTables === null || allowedTables === void 0 ? void 0 : allowedTables[0]) {

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

@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = sqlGenerator;
const lodash_1 = require("lodash");
const sql_gen_operator_gen_1 = __importDefault(require("./sql-gen-operator-gen"));
/**
* # SQL Query Generator
@ -170,6 +171,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
str +=
"," +
genObject.join
.filter((j) => !(0, lodash_1.isUndefined)(j))
.map((joinObj) => {
const joinTableName = joinObj.alias
? joinObj.alias
@ -212,6 +214,7 @@ function sqlGenerator({ tableName, genObject, dbFullName, count }) {
str +=
" " +
genObject.join
.filter((j) => !(0, lodash_1.isUndefined)(j))
.map((join) => {
return (join.joinType +
" " +

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

@ -851,7 +851,7 @@ export type ServerQueryParam<T extends {
addUserId?: {
fieldName: keyof T;
};
join?: ServerQueryParamsJoin<K>[];
join?: (ServerQueryParamsJoin<K> | undefined)[];
group?: (keyof T)[];
countSubQueries?: ServerQueryParamsCount[];
fullTextSearch?: ServerQueryParamFullTextSearch<T>;

3
package-shared/api-paths/utils/checks.ts
View File

@ -77,6 +77,9 @@ export default async function checks<
if (newQuery?.searchQuery?.join) {
for (let i = 0; i < newQuery.searchQuery.join.length; i++) {
const join = newQuery.searchQuery.join[i];
if (!join) continue;
const joinTableName = join.tableName;
const selectFields = join.selectFields;

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

@ -1,3 +1,4 @@
import { isUndefined } from "lodash";
import {
ServerQueryParam,
ServerQueryParamOrder,
@ -43,7 +44,7 @@ export default function sqlGenerator<
field,
}: {
queryObj: ServerQueryQueryObject[string];
join?: ServerQueryParamsJoin[];
join?: (ServerQueryParamsJoin | undefined)[];
field?: string;
}) {
const finalFieldName = (() => {
@ -247,6 +248,7 @@ export default function sqlGenerator<
str +=
"," +
genObject.join
.filter((j) => !isUndefined(j))
.map((joinObj) => {
const joinTableName = joinObj.alias
? joinObj.alias
@ -294,6 +296,7 @@ export default function sqlGenerator<
str +=
" " +
genObject.join
.filter((j) => !isUndefined(j))
.map((join) => {
return (
join.joinType +

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

@ -1043,7 +1043,7 @@ export type ServerQueryParam<
addUserId?: {
fieldName: keyof T;
};
join?: ServerQueryParamsJoin<K>[];
join?: (ServerQueryParamsJoin<K> | undefined)[];
group?: (keyof T)[];
countSubQueries?: ServerQueryParamsCount[];
fullTextSearch?: ServerQueryParamFullTextSearch<T>;

2
package.json
View File

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