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

properly handle IN queries

Browse Source
This commit is contained in:
Sven Klemm
2018-03-14 18:09:47 +01:00
parent 6793fa5e54
commit 64fa1ce8a0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/plugins/datasource/postgres/postgres_query.ts
View File

@ -1,6 +1,5 @@
import _ from 'lodash';
import queryPart from './query_part';
import kbn from 'app/core/utils/kbn';
export default class PostgresQuery {
target: any;
@ -26,14 +25,16 @@ export default class PostgresQuery {
target.select = target.select || [[{ type: 'column', params: ['value'] }]];
this.updateProjection();
// give interpolateQueryStr access to this
this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
}
quoteIdentifier(value) {
return '"' + value + '"';
return '"' + value.replace('"','""') + '"';
}
quoteLiteral(value) {
return "'" + value + "'";
return "'" + value.replace("'","''") + "'";
}
updateProjection() {
@ -147,10 +148,10 @@ export default class PostgresQuery {
}
if (typeof value === 'string') {
return kbn.regexEscape(value);
return this.quoteLiteral(value);
}
var escapedValues = _.map(value, kbn.regexEscape);
var escapedValues = _.map(value, this.quoteLiteral);
return '(' + escapedValues.join(',') + ')';
}