From e780b1bce5140a6c74fcc4782090e15035c5268a Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven.klemm@sql-ag.de>
Date: Sun, 11 Mar 2018 12:06:54 +0100
Subject: [PATCH] cleanup where segment handling

---
 .../plugins/datasource/postgres/query_ctrl.ts | 34 +++++++------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts
index 101d52ee096..afde342474b 100644
--- a/public/app/plugins/datasource/postgres/query_ctrl.ts
+++ b/public/app/plugins/datasource/postgres/query_ctrl.ts
@@ -68,26 +68,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
     this.metricColumnSegment = uiSegmentSrv.newSegment(this.target.metricColumn);
 
     this.buildSelectMenu();
-    this.whereSegments = [];
-    for (let tag of this.target.where) {
-      if (!tag.operator) {
-        if (/^\/.*\/$/.test(tag.value)) {
-          tag.operator = '=~';
-        } else {
-          tag.operator = '=';
-        }
-      }
-
-      if (tag.condition) {
-        this.whereSegments.push(uiSegmentSrv.newCondition(tag.condition));
-      }
-
-      this.whereSegments.push(uiSegmentSrv.newKey(tag.key));
-      this.whereSegments.push(uiSegmentSrv.newOperator(tag.operator));
-      this.whereSegments.push(uiSegmentSrv.newKeyValue(tag.value));
-    }
-
-    this.fixWhereSegments();
+    this.buildWhereSegments();
     this.groupBySegment = this.uiSegmentSrv.newPlusButton();
 
     this.removeWhereFilterSegment = uiSegmentSrv.newSegment({
@@ -264,7 +245,18 @@ export class PostgresQueryCtrl extends QueryCtrl {
     }
   }
 
-  fixWhereSegments() {
+  buildWhereSegments() {
+    this.whereSegments = [];
+    for (let constraint of this.target.where) {
+
+      if (constraint.condition) {
+        this.whereSegments.push(this.uiSegmentSrv.newCondition(constraint.condition));
+      }
+      this.whereSegments.push(this.uiSegmentSrv.newKey(constraint.key));
+      this.whereSegments.push(this.uiSegmentSrv.newOperator(constraint.operator));
+      this.whereSegments.push(this.uiSegmentSrv.newKeyValue(constraint.value));
+    }
+
     var count = this.whereSegments.length;
     var lastSegment = this.whereSegments[Math.max(count - 1, 0)];