From 64fa1ce8a0a3bfe6b7bb4e3c7cbc4227d0c42af4 Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven.klemm@sql-ag.de>
Date: Wed, 14 Mar 2018 18:09:47 +0100
Subject: [PATCH] properly handle IN queries

---
 .../app/plugins/datasource/postgres/postgres_query.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index 3a11c344f3e..8f9f1261340 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -1,6 +1,5 @@
 import _ from 'lodash';
 import queryPart from './query_part';
-import kbn from 'app/core/utils/kbn';
 
 export default class PostgresQuery {
   target: any;
@@ -26,14 +25,16 @@ export default class PostgresQuery {
     target.select = target.select || [[{ type: 'column', params: ['value'] }]];
 
     this.updateProjection();
+    // give interpolateQueryStr access to this
+    this.interpolateQueryStr = this.interpolateQueryStr.bind(this);
   }
 
   quoteIdentifier(value) {
-    return '"' + value + '"';
+    return '"' + value.replace('"','""') + '"';
   }
 
   quoteLiteral(value) {
-    return "'" + value + "'";
+    return "'" + value.replace("'","''") + "'";
   }
 
   updateProjection() {
@@ -147,10 +148,10 @@ export default class PostgresQuery {
     }
 
     if (typeof value === 'string') {
-      return kbn.regexEscape(value);
+      return this.quoteLiteral(value);
     }
 
-    var escapedValues = _.map(value, kbn.regexEscape);
+    var escapedValues = _.map(value, this.quoteLiteral);
     return '(' + escapedValues.join(',') + ')';
   }