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

feat: add omitTableAliases to sql dialect

Browse Source
This commit is contained in:
Nybkox
2025-01-14 14:32:22 +01:00
parent 1154eff459
commit 645a1d35e8
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/datalib/src/GridDisplay.ts
View File

@@ -253,7 +253,7 @@ export abstract class GridDisplay {
orCondition.conditions.push( orCondition.conditions.push(
_.cloneDeepWith(condition, (expr: Expression) => { _.cloneDeepWith(condition, (expr: Expression) => {
if (expr.exprType == 'placeholder') { if (expr.exprType == 'placeholder') {
return this.createColumnExpression(column, { alias: 'basetbl' }, undefined, 'filter'); return this.createColumnExpression(column, {}, undefined, 'filter');
} }
}) })
); );
@@ -584,7 +584,7 @@ export abstract class GridDisplay {
} }
return { return {
exprType: 'column', exprType: 'column',
alias: alias || col.columnName, ...(!this.dialect.omitTableAliases && { alias: alias || col.columnName }),
source, source,
...col, ...col,
}; };
@@ -597,9 +597,9 @@ export abstract class GridDisplay {
commandType: 'select', commandType: 'select',
from: { from: {
name: _.pick(name, ['schemaName', 'pureName']), name: _.pick(name, ['schemaName', 'pureName']),
alias: 'basetbl', ...(!this.dialect.omitTableAliases && { alias: 'basetbl' }),
}, },
columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' }, undefined, 'view')), columns: columns.map(col => this.createColumnExpression(col, {}, undefined, 'view')),
orderBy: this.driver?.requiresDefaultSortCriteria orderBy: this.driver?.requiresDefaultSortCriteria
? [ ? [
{ {
@@ -611,7 +611,10 @@ export abstract class GridDisplay {
: null, : null,
}; };
const displayedColumnInfo = _.keyBy( const displayedColumnInfo = _.keyBy(
this.columns.map(col => ({ ...col, sourceAlias: 'basetbl' })), this.columns.map(col => ({
...col,
...(!this.dialect.omitTableAliases && { sourceAlias: 'basetbl' }),
})),
'uniqueName' 'uniqueName'
); );
this.processReferences(select, displayedColumnInfo, options); this.processReferences(select, displayedColumnInfo, options);
@@ -639,7 +642,7 @@ export abstract class GridDisplay {
? x ? x
: { : {
...x, ...x,
source: { alias: 'basetbl' }, ...(!this.dialect.omitTableAliases && { source: { alias: 'basetbl' } }),
} }
) )
: [ : [

1
packages/types/dialect.d.ts vendored
View File

@@ -44,6 +44,7 @@ export interface SqlDialect {
omitForeignKeys?: boolean; omitForeignKeys?: boolean;
omitUniqueConstraints?: boolean; omitUniqueConstraints?: boolean;
omitIndexes?: boolean; omitIndexes?: boolean;
omitTableAliases?: boolean;
sortingKeys?: boolean; sortingKeys?: boolean;
// syntax for create column: ALTER TABLE table ADD COLUMN column // syntax for create column: ALTER TABLE table ADD COLUMN column