From 7a5b5906edad9a8ce98385fcdc03567a05dd0275 Mon Sep 17 00:00:00 2001
From: Sven Klemm <sven@timescale.com>
Date: Wed, 29 Aug 2018 12:24:28 +0200
Subject: [PATCH] fix quoting

---
 public/app/plugins/datasource/postgres/postgres_query.ts | 8 ++++----
 public/app/plugins/datasource/postgres/query_ctrl.ts     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/app/plugins/datasource/postgres/postgres_query.ts b/public/app/plugins/datasource/postgres/postgres_query.ts
index 26d21e013fd..3e055f42f03 100644
--- a/public/app/plugins/datasource/postgres/postgres_query.ts
+++ b/public/app/plugins/datasource/postgres/postgres_query.ts
@@ -37,22 +37,22 @@ export default class PostgresQuery {
   // remove identifier quoting from identifier to use in metadata queries
   unquoteIdentifier(value) {
     if (value[0] === '"' && value[value.length - 1] === '"') {
-      return value.substring(1, value.length - 1).replace('""', '"');
+      return value.substring(1, value.length - 1).replace(/""/g, '"');
     } else {
       return value;
     }
   }
 
   quoteIdentifier(value) {
-    return '"' + value.replace('"', '""') + '"';
+    return '"' + value.replace(/"/g, '""') + '"';
   }
 
   quoteLiteral(value) {
-    return "'" + value.replace("'", "''") + "'";
+    return "'" + value.replace(/'/g, "''") + "'";
   }
 
   escapeLiteral(value) {
-    return value.replace("'", "''");
+    return value.replace(/'/g, "''");
   }
 
   hasTimeGroup() {
diff --git a/public/app/plugins/datasource/postgres/query_ctrl.ts b/public/app/plugins/datasource/postgres/query_ctrl.ts
index 211e246eae8..686907a7dc0 100644
--- a/public/app/plugins/datasource/postgres/query_ctrl.ts
+++ b/public/app/plugins/datasource/postgres/query_ctrl.ts
@@ -385,7 +385,7 @@ export class PostgresQueryCtrl extends QueryCtrl {
 
     if (addAlias) {
       // set initial alias name to column name
-      partModel = sqlPart.create({ type: 'alias', params: [selectParts[0].params[0].replace('"', '')] });
+      partModel = sqlPart.create({ type: 'alias', params: [selectParts[0].params[0].replace(/"/g, '')] });
       if (selectParts[selectParts.length - 1].def.type === 'alias') {
         selectParts[selectParts.length - 1] = partModel;
       } else {