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

fix bug in query generation with metricColumn

Browse Source
This commit is contained in:
Sven Klemm
2018-07-15 09:42:24 +02:00
parent fa66645b0f
commit d9648f1fe7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@ export default class PostgresQuery {
query += '\n ' + this.buildTimeColumn();
if (this.hasMetricColumn()) {
query += '\n ' + this.buildMetricColumn();
query += ',\n ' + this.buildMetricColumn();
}
query += this.buildValueColumns();

4
public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
View File

@@ -103,5 +103,9 @@ describe('PostgresQuery', function() {
let query = new PostgresQuery(target, templateSrv);
expect(query.buildQuery()).toBe(result);
query.target.metricColumn = 'm';
result = 'SELECT\n t AS "time",\n m AS metric,\n value\nFROM public.table\nORDER BY 1';
expect(query.buildQuery()).toBe(result);
});
});