From d9648f1fe764cbc898da95fec430cb1212bcf99f Mon Sep 17 00:00:00 2001
From: Sven Klemm <pentabarf@gmail.com>
Date: Sun, 15 Jul 2018 09:42:24 +0200
Subject: [PATCH] fix bug in query generation with metricColumn

---
 public/app/plugins/datasource/postgres/postgres_query.ts      | 2 +-
 .../plugins/datasource/postgres/specs/postgres_query.jest.ts  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index 7826b455e99..5b0bd539abe 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -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();
 
diff --git a/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts b/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
index 9559cd3c350..42f1d5243d5 100644
--- a/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
+++ b/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
@@ -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);
   });
 });