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

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

@ -56,10 +56,6 @@ export default class PostgresQuery {
return _.find(this.target.groupBy, (g: any) => g.type === 'time');
}
hasFill() {
return _.find(this.target.groupBy, (g: any) => g.type === 'fill');
}
addGroupBy(value) {
var stringParts = value.match(/^(\w+)(\((.*)\))?$/);
var typePart = stringParts[1];
@ -130,19 +126,19 @@ export default class PostgresQuery {
this.updatePersistedParts();
}
private renderWhereConstraint(tag, index, interpolate) {
private renderWhereConstraint(constraint, index, interpolate) {
var str = '';
var operator = tag.operator;
var value = tag.value;
var operator = constraint.operator;
var value = constraint.value;
if (index > 0) {
str = (tag.condition || 'AND') + ' ';
str = (constraint.condition || 'AND') + ' ';
}
if (interpolate) {
value = this.templateSrv.replace(value, this.scopedVars);
}
return str + this.quoteIdentifier(tag.key) + ' ' + operator + ' ' + this.quoteLiteral(value);
return str + this.quoteIdentifier(constraint.key) + ' ' + operator + ' ' + this.quoteLiteral(value);
}
interpolateQueryStr(value, variable, defaultFormatFn) {
@ -207,7 +203,7 @@ export default class PostgresQuery {
query += ' FROM ' + this.quoteIdentifier(target.schema) + '.' + this.quoteIdentifier(target.table) + ' WHERE ';
var conditions = _.map(target.where, (tag, index) => {
return this.renderWhereConstraint(tag, index, interpolate);
return this.renderWhereConstraint(tag, index, false);
});
if (conditions.length > 0) {