From 36f76f5e2cfcef0ada2b1168ef082849c0e7de7b Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Fri, 29 Jan 2021 11:45:38 +0530
Subject: [PATCH] Fixed autocomplete issue where it is not showing any
 suggestions if the schema name contains escape characters. Fixes #6045.

---
 docs/en_US/release_notes_5_0.rst                  | 1 +
 web/pgadmin/utils/sqlautocomplete/autocomplete.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_5_0.rst b/docs/en_US/release_notes_5_0.rst
index 796ef7932..8c2134d18 100644
--- a/docs/en_US/release_notes_5_0.rst
+++ b/docs/en_US/release_notes_5_0.rst
@@ -18,3 +18,4 @@ Bug fixes
 *********
 
 | `Issue #5871 <https://redmine.postgresql.org/issues/5871>`_ -  Ensure that username should be visible in the 'Connect to Server' popup when service and user name both specified.
+| `Issue #6045 <https://redmine.postgresql.org/issues/6045>`_ -  Fixed autocomplete issue where it is not showing any suggestions if the schema name contains escape characters.
diff --git a/web/pgadmin/utils/sqlautocomplete/autocomplete.py b/web/pgadmin/utils/sqlautocomplete/autocomplete.py
index 8f432f438..6ed402c9c 100644
--- a/web/pgadmin/utils/sqlautocomplete/autocomplete.py
+++ b/web/pgadmin/utils/sqlautocomplete/autocomplete.py
@@ -1105,7 +1105,7 @@ class SQLAutoComplete(object):
         query = ''
 
         if schema:
-            in_clause = '\'' + schema + '\''
+            in_clause = '\'' + schema.replace("'", "''") + '\''
         else:
             for r in self.search_path:
                 in_clause += '\'' + r + '\','