fix where clause generation

8 years ago · 6143924ec6
parent 7600c6efcb
commit 6143924ec6
1 changed files with 2 additions and 2 deletions
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@ -194,7 +194,7 @@ export default class PostgresQuery {
      query += ', ' + selectText;
    }

-    query += ' FROM ' + target.schema + '.' + target.table + ' WHERE ';
+    query += ' FROM ' + target.schema + '.' + target.table;
    var conditions = _.map(target.where, (tag, index) => {
      switch (tag.type) {
        case 'macro':
@ -207,7 +207,7 @@ export default class PostgresQuery {
    });

    if (conditions.length > 0) {
-      query += conditions.join(' AND ');
+      query += ' WHERE ' + conditions.join(' AND ');
    }

    var groupBySection = '';