IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-29 12:14:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(influxdb): quote number valued tag values, only not quote when operator is > or <, fixes #4885

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-05-03 10:25:06 +02:00
parent 152e085310
commit fe0b7533a1
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/influxdb/influx_query.ts
View File

@ -152,7 +152,7 @@ export default class InfluxQuery {
if (interpolate) {
value = this.templateSrv.replace(value, this.scopedVars);
}
if (isNaN(+value)) {
if (operator !== '>' && operator !== '<') {
value = "'" + value.replace('\\', '\\\\') + "'";
}
} else if (interpolate){

13
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
View File

@ -101,6 +101,19 @@ describe('InfluxQuery', function() {
});
});
describe('query with value condition', function() {
it('should not quote value', function() {
var query = new InfluxQuery({
measurement: 'cpu',
groupBy: [],
tags: [{key: 'value', value: '5', operator: '>'}]
}, templateSrv, {});
var queryText = query.render();
expect(queryText).to.be('SELECT mean("value") FROM "cpu" WHERE "value" > 5 AND $timeFilter');
});
});
describe('series with groupByTag', function() {
it('should generate correct query', function() {
var query = new InfluxQuery({