dont quote variables for mysql and postgres datasource (#9611)

This commit is contained in:
Sven Klemm 2017-10-24 14:05:41 +02:00 committed by Daniel Lee
parent 2f35759346
commit 56e53b8343
4 changed files with 25 additions and 5 deletions

View File

@ -17,7 +17,7 @@ export class MysqlDatasource {
interpolateVariable(value) {
if (typeof value === 'string') {
return '\'' + value + '\'';
return value;
}
if (typeof value === 'number') {

View File

@ -196,8 +196,8 @@ describe('MySQLDatasource', function() {
describe('When interpolating variables', () => {
describe('and value is a string', () => {
it('should return a quoted value', () => {
expect(ctx.ds.interpolateVariable('abc')).to.eql('\'abc\'');
it('should return an unquoted value', () => {
expect(ctx.ds.interpolateVariable('abc')).to.eql('abc');
});
});

View File

@ -17,11 +17,11 @@ export class PostgresDatasource {
interpolateVariable(value) {
if (typeof value === 'string') {
return '\'' + value + '\'';
return value;
}
if (typeof value === 'number') {
return value.toString();
return value;
}
var quotedValues = _.map(value, function(val) {

View File

@ -193,4 +193,24 @@ describe('PostgreSQLDatasource', function() {
expect(results[0].value).to.be('same');
});
});
describe('When interpolating variables', () => {
describe('and value is a string', () => {
it('should return an unquoted value', () => {
expect(ctx.ds.interpolateVariable('abc')).to.eql('abc');
});
});
describe('and value is a number', () => {
it('should return an unquoted value', () => {
expect(ctx.ds.interpolateVariable(1000)).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\'');
});
});
});
});