opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-26 05:13:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

use quoting functions from MysqlQuery in datasource

Browse Source
This commit is contained in:
Sven Klemm
2018-08-31 16:27:48 +02:00
parent 390472aa99
commit 8d73f53e97
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/plugins/datasource/mysql/datasource.ts
View File

@ -19,7 +19,7 @@ export class MysqlDatasource {
interpolateVariable(value, variable) { interpolateVariable(value, variable) {
if (typeof value === 'string') { if (typeof value === 'string') {
if (variable.multi || variable.includeAll) { if (variable.multi || variable.includeAll) {
return "'" + value.replace(/'/g, `''`) + "'"; return this.queryModel.quoteLiteral(value);
} else { } else {
return value; return value;
} }
@ -29,12 +29,8 @@ export class MysqlDatasource {
return value; return value;
} }
const quotedValues = _.map(value, function(val) { const quotedValues = _.map(value, v => {
if (typeof value === 'number') { return this.queryModel.quoteLiteral(v);
return value;
}
return "'" + val.replace(/'/g, `''`) + "'";
}); });
return quotedValues.join(','); return quotedValues.join(',');
} }