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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,22 +77,16 @@ export default class PostgresQuery {
render(interpolate?) {
let target = this.target;
let query;
if (target.rawQuery) {
if (interpolate) {
return this.templateSrv.replace(target.rawSql, this.scopedVars, this.interpolateQueryStr);
} else {
return target.rawSql;
}
if (!target.rawQuery) {
target.rawSql = this.buildQuery();
}
query = this.buildQuery();
if (interpolate) {
query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
return this.templateSrv.replace(target.rawSql, this.scopedVars, this.interpolateQueryStr);
} else {
return target.rawSql;
}
this.target.rawSql = query;
return query;
}
buildTimeColumn() {