dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-27 20:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

skip condition in query designer, when parsing failed

Browse Source
This commit is contained in:
Jan Prochazka
2022-01-01 10:48:18 +01:00
parent 020382a153
commit 579d72f03a
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
packages/web/src/designer/DesignerQueryDumper.ts
View File

@@ -85,19 +85,24 @@ export class DesignerQueryDumper {
if (!table) continue; if (!table) continue;
if (!tables.find(x => x.designerId == table.designerId)) continue; if (!tables.find(x => x.designerId == table.designerId)) continue;
const condition = parseFilter(column.filter, findDesignerFilterType(column, this.designer)); try {
if (condition) { const condition = parseFilter(column.filter, findDesignerFilterType(column, this.designer));
select.where = mergeConditions( if (condition) {
select.where, select.where = mergeConditions(
_.cloneDeepWith(condition, expr => { select.where,
if (expr.exprType == 'placeholder') _.cloneDeepWith(condition, expr => {
return { if (expr.exprType == 'placeholder')
exprType: 'column', return {
columnName: column.columnName, exprType: 'column',
source: findQuerySource(this.designer, column.designerId), columnName: column.columnName,
}; source: findQuerySource(this.designer, column.designerId),
}) };
); })
);
}
} catch (err) {
// condition is skipped
continue;
} }
} }
} }