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

ref loading ref column

Browse Source
This commit is contained in:
Jan Prochazka
2022-07-28 20:03:48 +02:00
parent 5ac6e12c3e
commit d23371f642
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/datalib/src/PerspectiveTreeNode.ts
View File

@@ -177,6 +177,7 @@ export abstract class PerspectiveTreeNode {
export class PerspectiveTableColumnNode extends PerspectiveTreeNode { export class PerspectiveTableColumnNode extends PerspectiveTreeNode {
foreignKey: ForeignKeyInfo; foreignKey: ForeignKeyInfo;
refTable: TableInfo;
constructor( constructor(
public column: ColumnInfo, public column: ColumnInfo,
public table: TableInfo, public table: TableInfo,
@@ -192,6 +193,10 @@ export class PerspectiveTableColumnNode extends PerspectiveTreeNode {
this.foreignKey = this.foreignKey =
table.foreignKeys && table.foreignKeys &&
table.foreignKeys.find(fk => fk.columns.length == 1 && fk.columns[0].columnName == column.columnName); table.foreignKeys.find(fk => fk.columns.length == 1 && fk.columns[0].columnName == column.columnName);
this.refTable = db.tables.find(
x => x.pureName == this.foreignKey?.refTableName && x.schemaName == this.foreignKey?.refSchemaName
);
} }
matchChildRow(parentRow: any, childRow: any): boolean { matchChildRow(parentRow: any, childRow: any): boolean {
@@ -221,7 +226,7 @@ export class PerspectiveTableColumnNode extends PerspectiveTreeNode {
), ),
dataColumns: this.getDataLoadColumns(), dataColumns: this.getDataLoadColumns(),
databaseConfig: this.databaseConfig, databaseConfig: this.databaseConfig,
orderBy: this.table.primaryKey?.columns.map(x => x.columnName) || [this.table.columns[0].columnName], orderBy: this.refTable?.primaryKey?.columns.map(x => x.columnName) || [this.refTable.columns[0].columnName],
}; };
} }

1
packages/web/src/perspectives/PerspectiveTable.svelte
View File

@@ -90,6 +90,7 @@
dbg('display rows', rows); dbg('display rows', rows);
errorMessage = null; errorMessage = null;
} catch (err) { } catch (err) {
console.error(err);
errorMessage = err.message; errorMessage = err.message;
dataRows = null; dataRows = null;
} }