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

always quote template variables for postgres when multi-value or include (#9714)

Browse Source 
all is allowed
This commit is contained in:
Sven Klemm
2017-10-31 12:23:21 +01:00
committed by Torkel Ödegaard
parent ae11bf7c14
commit caa8b6100e
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/app/plugins/datasource/postgres/specs/datasource_specs.ts
View File

@ -2,6 +2,7 @@ import {describe, beforeEach, it, expect, angularMocks} from 'test/lib/common';
import moment from 'moment';
import helpers from 'test/specs/helpers';
import {PostgresDatasource} from '../datasource';
import {CustomVariable} from 'app/features/templating/custom_variable';
describe('PostgreSQLDatasource', function() {
var ctx = new helpers.ServiceTestContext();
@ -195,22 +196,41 @@ describe('PostgreSQLDatasource', function() {
});
describe('When interpolating variables', () => {
beforeEach(function() {
ctx.variable = new CustomVariable({},{});
});
describe('and value is a string', () => {
it('should return an unquoted value', () => {
expect(ctx.ds.interpolateVariable('abc')).to.eql('abc');
expect(ctx.ds.interpolateVariable('abc', ctx.variable)).to.eql('abc');
});
});
describe('and value is a number', () => {
it('should return an unquoted value', () => {
expect(ctx.ds.interpolateVariable(1000)).to.eql(1000);
expect(ctx.ds.interpolateVariable(1000, ctx.variable)).to.eql(1000);
});
});
describe('and value is an array of strings', () => {
it('should return comma separated quoted values', () => {
expect(ctx.ds.interpolateVariable(['a', 'b', 'c'])).to.eql('\'a\',\'b\',\'c\'');
expect(ctx.ds.interpolateVariable(['a', 'b', 'c'], ctx.variable)).to.eql('\'a\',\'b\',\'c\'');
});
});
describe('and variable allows multi-value and is a string', () => {
it('should return a quoted value', () => {
ctx.variable.multi = true;
expect(ctx.ds.interpolateVariable('abc', ctx.variable)).to.eql('\'abc\'');
});
});
describe('and variable allows all and is a string', () => {
it('should return a quoted value', () => {
ctx.variable.includeAll = true;
expect(ctx.ds.interpolateVariable('abc', ctx.variable)).to.eql('\'abc\'');
});
});
});
});