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

handle variables in where constraints

Browse Source
This commit is contained in:
Sven Klemm
2018-03-10 20:18:03 +01:00
parent 1d8540ac69
commit cb5278d413
2 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,6 @@ export class PostgresQueryCtrl extends QueryCtrl {
rebuildTargetWhereConditions() {
var where = [];
var tagIndex = 0;
var tagOperator = '';
_.each(this.whereSegments, (segment2, index) => {
if (segment2.type === 'key') {
@ -362,11 +361,8 @@ export class PostgresQueryCtrl extends QueryCtrl {
}
where[tagIndex].key = segment2.value;
} else if (segment2.type === 'value') {
tagOperator = this.getTagValueOperator(segment2.value, where[tagIndex].operator);
if (tagOperator) {
this.whereSegments[index - 1] = this.uiSegmentSrv.newOperator(tagOperator);
where[tagIndex].operator = tagOperator;
}
where[tagIndex].value = segment2.value;
} else if (segment2.type === 'template') {
where[tagIndex].value = segment2.value;
} else if (segment2.type === 'condition') {
where.push({ condition: segment2.value });