IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed OR statement for influxdb 0.9 editor, #1525

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-06-29 16:03:30 +02:00
parent 11170dd34c
commit 15e6a4266c
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/test/specs/influx09-querybuilder-specs.js
View File

@@ -52,6 +52,20 @@ define([
});
});
describe('series with tags OR condition', function() {
var builder = new InfluxQueryBuilder({
measurement: 'cpu',
tags: [{key: 'hostname', value: 'server1'}, {key: 'hostname', value: 'server2', condition: "OR"}]
});
var query = builder.build();
it('should generate correct query', function() {
expect(query).to.be('SELECT mean(value) FROM "cpu" WHERE hostname = \'server1\' OR hostname = \'server2\' AND ' +
'$timeFilter GROUP BY time($interval) ORDER BY asc');
});
});
describe('series with groupByTag', function() {
it('should generate correct query', function() {
var builder = new InfluxQueryBuilder({