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

fixes

Browse Source
This commit is contained in:
Jan Prochazka
2020-05-13 17:56:09 +02:00
parent 99a6b1bb31
commit 97901d2d6f
3 changed files with 56 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/datalib/src/TableGridDisplay.ts
View File

@@ -69,14 +69,16 @@ export class TableGridDisplay extends GridDisplay {
const childAlias = `${column.uniqueName}_ref`;
const subcolumns = this.getDisplayColumns(table, column.uniquePath);
this.addReferenceToSelect(select, parentAlias, column);
let added = false;
if (this.addJoinsFromExpandedColumns(select, subcolumns, childAlias, columnSources)) added = true;
if (this.addAddedColumnsToSelect(select, subcolumns, childAlias, columnSources)) added = true;
if (added) {
this.addReferenceToSelect(select, parentAlias, column);
res = true;
}
// if (added) {
// this.addReferenceToSelect(select, parentAlias, column);
// res = true;
// }
}
}
}
@@ -169,7 +171,7 @@ export class TableGridDisplay extends GridDisplay {
let res = false;
if (this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo)) res = true;
if (this.addHintsToSelect(select)) res = true;
if (select.from.relations) select.from.relations.reverse();
// if (select.from.relations) select.from.relations.reverse();
return res;
}