IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-15 18:13:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

dont order for aggregate

Browse Source
This commit is contained in:
Sven Klemm 2018-08-03 10:15:28 +02:00
parent dabfd88cd9
commit aa830211fe
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/plugins/datasource/postgres/postgres_query.ts
View File

@ -151,11 +151,7 @@ export default class PostgresQuery {
if (func === 'first' || func === 'last') { if (func === 'first' || func === 'last') {
query = func + '(' + query + ',' + this.target.timeColumn + ')'; query = func + '(' + query + ',' + this.target.timeColumn + ')';
} else { } else {
if (windows) { query = func + '(' + query + ')';
query = func + '(' + query + ' ORDER BY ' + this.target.timeColumn + ')';
} else {
query = func + '(' + query + ')';
}
} }
break; break;
case 'percentile': case 'percentile':

4
public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
View File

@ -98,8 +98,8 @@ describe('PostgresQuery', function() {
{ type: 'window', params: ['increase'] }, { type: 'window', params: ['increase'] },
]; ];
expect(query.buildValueColumn(column)).toBe( expect(query.buildValueColumn(column)).toBe(
'(CASE WHEN max(v ORDER BY time) >= lag(max(v ORDER BY time)) OVER (PARTITION BY host ORDER BY time) ' + '(CASE WHEN max(v) >= lag(max(v)) OVER (PARTITION BY host ORDER BY time) ' +
'THEN max(v ORDER BY time) - lag(max(v ORDER BY time)) OVER (PARTITION BY host ORDER BY time) ELSE max(v ORDER BY time) END) AS "a"' 'THEN max(v) - lag(max(v)) OVER (PARTITION BY host ORDER BY time) ELSE max(v) END) AS "a"'
); );
}); });