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

add where constraint handling

Browse Source
This commit is contained in:
Sven Klemm
2018-02-08 10:25:32 +01:00
parent 3bce45d8a6
commit ef18eb7fcb
3 changed files with 163 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,17 +19,22 @@ export default class PostgresQuery {
target.schema = target.schema || 'public';
target.format = target.format || 'time_series';
target.timeColumn = target.timeColumn || 'time';
target.alias = '';
target.metricColumn = target.metricColumn || 'None';
target.orderByTime = target.orderByTime || 'ASC';
target.groupBy = target.groupBy || [{ type: 'time', params: ['$__interval'] }, { type: 'fill', params: ['null'] }];
target.groupBy = target.groupBy || [];
target.where = target.where || [];
target.select = target.select || [[{ type: 'field', params: ['value'] }]];
this.updateProjection();
}
quoteIdentifier(field) {
return '"' + field + '"';
quoteIdentifier(value) {
return '"' + value + '"';
}
quoteLiteral(value) {
return "'" + value + "'";
}
updateProjection() {
@ -202,7 +207,7 @@ export default class PostgresQuery {
}
query += ' FROM ' + target.schema + '.' + target.table + ' WHERE ';
var conditions = _.map(target.tags, (tag, index) => {
var conditions = _.map(target.where, (tag, index) => {
return this.renderTagCondition(tag, index, interpolate);
});