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

explicit order criteria only on MSSQL #436

Browse Source
This commit is contained in:
Jan Prochazka
2023-02-04 15:58:45 +01:00
parent 57fa9335d4
commit 83ba530112
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -519,13 +519,15 @@ export abstract class GridDisplay {
alias: 'basetbl', alias: 'basetbl',
}, },
columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })), columns: columns.map(col => this.createColumnExpression(col, { alias: 'basetbl' })),
orderBy: [ orderBy: this.driver?.requiresDefaultSortCriteria
{ ? [
exprType: 'column', {
columnName: orderColumnName, exprType: 'column',
direction: 'ASC', columnName: orderColumnName,
}, direction: 'ASC',
], },
]
: null,
}; };
const displayedColumnInfo = _.keyBy( const displayedColumnInfo = _.keyBy(
this.columns.map(col => ({ ...col, sourceAlias: 'basetbl' })), this.columns.map(col => ({ ...col, sourceAlias: 'basetbl' })),

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

@@ -78,6 +78,7 @@ export interface EngineDriver {
supportsDatabaseDump?: boolean; supportsDatabaseDump?: boolean;
supportsServerSummary?: boolean; supportsServerSummary?: boolean;
supportsDatabaseProfiler?: boolean; supportsDatabaseProfiler?: boolean;
requiresDefaultSortCriteria?: boolean;
profilerFormatterFunction?: string; profilerFormatterFunction?: string;
profilerTimestampFunction?: string; profilerTimestampFunction?: string;
profilerChartAggregateFunction?: string; profilerChartAggregateFunction?: string;

1
plugins/dbgate-plugin-mssql/src/frontend/driver.js
View File

@@ -114,6 +114,7 @@ const driver = {
dumperClass: MsSqlDumper, dumperClass: MsSqlDumper,
dialect, dialect,
readOnlySessions: false, readOnlySessions: false,
requiresDefaultSortCriteria: true,
dialectByVersion(version) { dialectByVersion(version) {
if (version && version.productVersionNumber < 11) { if (version && version.productVersionNumber < 11) {
return { return {