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

Refactor time column sql generation

Browse Source
This commit is contained in:
Sven Klemm 2018-07-11 11:00:12 +02:00
parent c5bde0ef45
commit 772825ed09
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,10 +187,9 @@ export default class PostgresQuery {
return query; return query;
} }
buildQuery(target) { buildTimeColumn(target) {
var query = 'SELECT '; let timeGroup = this.hasGroupByTime();
let query;
var timeGroup = this.hasGroupByTime();
if (timeGroup) { if (timeGroup) {
var args; var args;
@ -199,11 +198,19 @@ export default class PostgresQuery {
} else { } else {
args = timeGroup.params[0]; args = timeGroup.params[0];
} }
query += '$__timeGroup(' + target.timeColumn + ',' + args + ')'; query = '$__timeGroup(' + target.timeColumn + ',' + args + ')';
} else { } else {
query += target.timeColumn + ' AS "time"'; query = target.timeColumn + ' AS "time"';
} }
return query;
}
buildQuery(target) {
var query = 'SELECT ';
query += this.buildTimeColumn(target);
if (this.target.metricColumn !== 'None') { if (this.target.metricColumn !== 'None') {
query += ',' + this.target.metricColumn + ' AS metric'; query += ',' + this.target.metricColumn + ' AS metric';
} }