IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-14 01:23:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor render function on PostgresQuery

Browse Source
This commit is contained in:
Sven Klemm 2018-07-11 10:50:49 +02:00
parent 1d711924bc
commit c5bde0ef45
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

@ -169,7 +169,8 @@ export default class PostgresQuery {
}
render(interpolate?) {
var target = this.target;
let target = this.target;
let query;
if (target.rawQuery) {
if (interpolate) {
@ -179,6 +180,14 @@ export default class PostgresQuery {
}
}
query = this.buildQuery(target);
if (interpolate) {
query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
}
return query;
}
buildQuery(target) {
var query = 'SELECT ';
var timeGroup = this.hasGroupByTime();
@ -250,9 +259,6 @@ export default class PostgresQuery {
query += ' ORDER BY 1';
this.target.rawSql = query;
if (interpolate) {
query = this.templateSrv.replace(query, this.scopedVars, this.interpolateQueryStr);
}
return query;
}
}