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

fixed Syntax error when trying to sort by UUID column #895

Browse Source
This commit is contained in:
Jan Prochazka 2024-09-26 09:06:14 +02:00
parent 888f5c6260
commit a4872b4159
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ export abstract class GridDisplay {
applySortOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) { applySortOnSelect(select: Select, displayedColumnInfo: DisplayedColumnInfo) {
if (this.config.sort?.length > 0) { if (this.config.sort?.length > 0) {
select.orderBy = this.config.sort const orderByColumns = this.config.sort
.map(col => ({ ...col, dispInfo: displayedColumnInfo[col.uniqueName] })) .map(col => ({ ...col, dispInfo: displayedColumnInfo[col.uniqueName] }))
.map(col => ({ ...col, expr: select.columns.find(x => x.alias == col.uniqueName) })) .map(col => ({ ...col, expr: select.columns.find(x => x.alias == col.uniqueName) }))
.filter(col => col.dispInfo && col.expr) .filter(col => col.dispInfo && col.expr)
@ -286,6 +286,10 @@ export abstract class GridDisplay {
...col.expr, ...col.expr,
direction: col.order, direction: col.order,
})); }));
if (orderByColumns.length > 0) {
select.orderBy = orderByColumns;
}
} }
} }

14
plugins/dbgate-plugin-postgres/src/frontend/drivers.js
View File

@ -105,11 +105,11 @@ const dialect = {
exprType: 'unaryRaw', exprType: 'unaryRaw',
expr: { expr: {
exprType: 'column', exprType: 'column',
alias: alias || columnName,
source, source,
columnName, columnName,
}, },
afterSql: '::text', afterSql: '::text',
alias: alias || columnName,
}; };
} }
}, },
@ -136,9 +136,15 @@ const postgresDriverBase = {
} }
return ( return (
['authType', 'user', 'password', 'defaultDatabase', 'singleDatabase', 'isReadOnly', 'useSeparateSchemas'].includes( [
field 'authType',
) || 'user',
'password',
'defaultDatabase',
'singleDatabase',
'isReadOnly',
'useSeparateSchemas',
].includes(field) ||
(values.authType == 'socket' && ['socketPath'].includes(field)) || (values.authType == 'socket' && ['socketPath'].includes(field)) ||
(values.authType != 'socket' && ['server', 'port'].includes(field)) (values.authType != 'socket' && ['server', 'port'].includes(field))
); );