opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-09-25 23:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

dont expand variables in rawSql

Browse Source
This commit is contained in:
Sven Klemm
2018-07-15 17:02:26 +02:00
parent 2fcb09b23d
commit 070b556fd3
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,9 +77,11 @@ export default class PostgresQuery {
render(interpolate?) { render(interpolate?) {
let target = this.target; let target = this.target;
let query;
if (target.rawQuery) { if (!target.rawQuery) {
target.rawSql = this.buildQuery();
}
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 {
@ -87,14 +89,6 @@ export default class PostgresQuery {
} }
} }
query = this.buildQuery();
if (interpolate) {
query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
}
this.target.rawSql = query;
return query;
}
buildTimeColumn() { buildTimeColumn() {
let timeGroup = this.hasGroupByTime(); let timeGroup = this.hasGroupByTime();
let query; let query;