opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-22 06:31:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

add first and last support

Browse Source
This commit is contained in:
Sven Klemm
2018-07-29 15:00:13 +02:00
parent d7ddab958e
commit 26ea88252b
2 changed files with 52 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,16 +138,21 @@ export default class PostgresQuery {
let special = _.find(column, (g: any) => g.type === 'window');
if (aggregate) {
let func = aggregate.params[0];
switch (aggregate.type) {
case 'aggregate':
if (special) {
query = aggregate.params[0] + '(' + query + ' ORDER BY ' + this.target.timeColumn + ')';
if (func === 'first' || func === 'last') {
query = func + '(' + query + ',' + this.target.timeColumn + ')';
} else {
query = aggregate.params[0] + '(' + query + ')';
if (special) {
query = func + '(' + query + ' ORDER BY ' + this.target.timeColumn + ')';
} else {
query = func + '(' + query + ')';
}
}
break;
case 'percentile':
query = aggregate.params[0] + '(' + aggregate.params[1] + ') WITHIN GROUP (ORDER BY ' + query + ')';
query = func + '(' + aggregate.params[1] + ') WITHIN GROUP (ORDER BY ' + query + ')';
break;
}
}