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

use $__timeGroupAlias macro

Browse Source
This commit is contained in:
Sven Klemm
2018-08-02 21:40:15 +02:00
parent 5c25844cd9
commit 2cae966e6c
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,7 +92,7 @@ export default class PostgresQuery {
} }
} }
buildTimeColumn() { buildTimeColumn(alias = true) {
let timeGroup = this.hasTimeGroup(); let timeGroup = this.hasTimeGroup();
let query; let query;
@ -103,9 +103,16 @@ export default class PostgresQuery {
} else { } else {
args = timeGroup.params[0]; args = timeGroup.params[0];
} }
query = '$__timeGroup(' + this.target.timeColumn + ',' + args + ')'; if (alias) {
query = '$__timeGroupAlias(' + this.target.timeColumn + ',' + args + ')';
} else { } else {
query = this.target.timeColumn + ' AS "time"'; query = '$__timeGroup(' + this.target.timeColumn + ',' + args + ')';
}
} else {
query = this.target.timeColumn;
if (alias) {
query += ' AS "time"';
}
} }
return query; return query;
@ -162,9 +169,7 @@ export default class PostgresQuery {
if (this.hasMetricColumn()) { if (this.hasMetricColumn()) {
overParts.push('PARTITION BY ' + this.target.metricColumn); overParts.push('PARTITION BY ' + this.target.metricColumn);
} }
if (!aggregate) { overParts.push('ORDER BY ' + this.buildTimeColumn(false));
overParts.push('ORDER BY ' + this.target.timeColumn);
}
let over = overParts.join(' '); let over = overParts.join(' ');
let curr: string; let curr: string;