mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Jan Prochazka 2020-05-13 17:59:33 +02:00
parent 97901d2d6f
commit 6ba5d98883
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,8 +60,7 @@ export class TableGridDisplay extends GridDisplay {
);
}
addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources): boolean {
let res = false;
addJoinsFromExpandedColumns(select: Select, columns: DisplayColumn[], parentAlias: string, columnSources) {
for (const column of columns) {
if (this.isExpandedColumn(column.uniqueName)) {
const table = this.getFkTarget(column);
@ -71,19 +70,11 @@ export class TableGridDisplay extends GridDisplay {
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;
// }
this.addJoinsFromExpandedColumns(select, subcolumns, childAlias, columnSources)
this.addAddedColumnsToSelect(select, subcolumns, childAlias, columnSources)
}
}
}
return res;
// const addedColumns = this.getGridColumns().filter(x=>x.)
}
addReferenceToSelect(select: Select, parentAlias: string, column: DisplayColumn) {
@ -167,12 +158,9 @@ export class TableGridDisplay extends GridDisplay {
return this.findTable({ schemaName, pureName });
}
processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo): boolean {
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();
return res;
processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo) {
this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
this.addHintsToSelect(select);
}
createSelect() {
@ -208,8 +196,7 @@ export class TableGridDisplay extends GridDisplay {
columns: DisplayColumn[],
parentAlias: string,
displayedColumnInfo: DisplayedColumnInfo
): boolean {
let res = false;
) {
for (const column of columns) {
if (this.config.addedColumns.includes(column.uniqueName)) {
select.columns.push({
@ -222,9 +209,7 @@ export class TableGridDisplay extends GridDisplay {
...column,
sourceAlias: parentAlias,
};
res = true;
}
}
return res;
}
}