IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

set query gui as default handle old panels gracefully

Browse Source
This commit is contained in:
Sven Klemm 2018-07-10 21:40:59 +02:00
parent 9d5b4cb91d
commit 0e610cad1b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,13 @@ export default class PostgresQuery {
// handle pre query gui panels gracefully
if (!('rawQuery' in this.target)) {
target.rawQuery = true;
if ('rawSql' in target) {
// pre query gui panel
target.rawQuery = true;
} else {
// new panel
target.rawQuery = false;
}
}
// give interpolateQueryStr access to this
@ -55,10 +61,10 @@ export default class PostgresQuery {
updateProjection() {
this.selectModels = _.map(this.target.select, function(parts: any) {
return _.map(parts, sqlPart.create);
return _.map(parts, sqlPart.create).filter(n => n);
});
this.whereParts = _.map(this.target.where, sqlPart.create);
this.groupByParts = _.map(this.target.groupBy, sqlPart.create);
this.whereParts = _.map(this.target.where, sqlPart.create).filter(n => n);
this.groupByParts = _.map(this.target.groupBy, sqlPart.create).filter(n => n);
}
updatePersistedParts() {