opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-28 07:53:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into postgres-query-builder

Browse Source
This commit is contained in:
Sven Klemm
2018-08-02 16:39:27 +02:00
parent 7e9c9199c1 5cca478656
commit 67edb9e9fe
35 changed files with 203 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/plugins/datasource/postgres/datasource.ts
View File

@ -17,7 +17,7 @@ export class PostgresDatasource {
interpolateVariable(value, variable) {
if (typeof value === 'string') {
if (variable.multi || variable.includeAll) {
return "'" + value + "'";
return "'" + value.replace(/'/g, `''`) + "'";
} else {
return value;
}
@ -28,7 +28,7 @@ export class PostgresDatasource {
}
let quotedValues = _.map(value, function(val) {
return "'" + val + "'";
return "'" + val.replace(/'/g, `''`) + "'";
});
return quotedValues.join(',');
}