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

handle pre query gui queries gracefully

Browse Source
This commit is contained in:
Sven Klemm
2018-07-07 20:41:24 +02:00
parent eb170e741b
commit 8490ae41b6
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,11 @@ export default class PostgresQuery {
target.where = target.where || []; target.where = target.where || [];
target.select = target.select || [[{ type: 'column', params: ['value'] }]]; target.select = target.select || [[{ type: 'column', params: ['value'] }]];
// handle pre query gui panels gracefully
if (!('rawQuery' in this.target)) {
target.rawQuery = true;
}
// give interpolateQueryStr access to this // give interpolateQueryStr access to this
this.interpolateQueryStr = this.interpolateQueryStr.bind(this); this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
@@ -149,7 +154,7 @@ export default class PostgresQuery {
render(interpolate?) { render(interpolate?) {
var target = this.target; var target = this.target;
if (target.rawQuery || !('rawQuery' in target)) { if (target.rawQuery) {
if (interpolate) { if (interpolate) {
return this.templateSrv.replace(target.rawSql, this.scopedVars, this.interpolateQueryStr); return this.templateSrv.replace(target.rawSql, this.scopedVars, this.interpolateQueryStr);
} else { } else {