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

refactor function handling in query builder

Browse Source
This commit is contained in:
Sven Klemm
2018-07-29 13:30:21 +02:00
parent 5327580939
commit 412bb6acab
4 changed files with 81 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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