From 0e608a08c25eaa5308021564852a8f3607a9f28e Mon Sep 17 00:00:00 2001
From: Sven Klemm <pentabarf@gmail.com>
Date: Sun, 15 Jul 2018 22:58:25 +0200
Subject: [PATCH] fix test for query generation

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

diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index 6bec3f87a85..4e60eee9e11 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -17,7 +17,7 @@ export default class PostgresQuery {
     target.metricColumn = target.metricColumn || 'none';
 
     target.groupBy = target.groupBy || [];
-    target.where = target.where || [{ type: 'macro', params: ['$__timeFilter'] }];
+    target.where = target.where || [{ type: 'macro', name: '$__timeFilter', params: [] }];
     target.select = target.select || [[{ type: 'column', params: ['value'] }]];
 
     // handle pre query gui panels gracefully
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 42f1d5243d5..d9b3f46b4bf 100644
--- a/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
+++ b/public/app/plugins/datasource/postgres/specs/postgres_query.jest.ts
@@ -98,6 +98,7 @@ describe('PostgresQuery', function() {
       schema: 'public',
       table: 'table',
       select: [[{ type: 'column', params: ['value'] }]],
+      where: [],
     };
     let result = 'SELECT\n  t AS "time",\n  value\nFROM public.table\nORDER BY 1';
     let query = new PostgresQuery(target, templateSrv);