opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 21:32:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor column function handling

Browse Source
This commit is contained in:
Sven Klemm
2018-07-28 21:30:08 +02:00
parent 6ca7a03975
commit 5327580939
5 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/app/plugins/datasource/postgres/query_ctrl.ts
View File

@ -99,8 +99,28 @@ export class PostgresQueryCtrl extends QueryCtrl {
buildSelectMenu() {
this.selectMenu = [
{ text: 'Aggregate', value: 'aggregate' },
{ text: 'Special', value: 'special' },
{
text: 'Aggregate Functions',
value: 'aggregate',
submenu: [
{ text: 'Average', value: 'avg' },
{ text: 'Count', value: 'count' },
{ text: 'Maximum', value: 'max' },
{ text: 'Minimum', value: 'min' },
{ text: 'Sum', value: 'sum' },
{ text: 'Standard deviation', value: 'stddev' },
{ text: 'Variance', value: 'variance' },
],
},
{
text: 'Window Functions',
value: 'window',
submenu: [
{ text: 'Increase', value: 'increase' },
{ text: 'Rate', value: 'rate' },
{ text: 'Sum', value: 'sum' },
],
},
{ text: 'Alias', value: 'alias' },
{ text: 'Column', value: 'column' },
];
@ -207,8 +227,11 @@ export class PostgresQueryCtrl extends QueryCtrl {
};
}
addSelectPart(selectParts, item) {
addSelectPart(selectParts, item, subItem) {
let partModel = sqlPart.create({ type: item.value });
if (subItem) {
partModel.params = [subItem.value];
}
let addAlias = false;
switch (item.value) {
@ -223,7 +246,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
if (this.target.group.length === 0) {
this.addGroup('time', '1m');
}
case 'special':
case 'window':
let index = _.findIndex(selectParts, (p: any) => p.def.type === item.value);
if (index !== -1) {
selectParts[index] = partModel;