From e16090942384a8f132534544c9654fa248a8013d Mon Sep 17 00:00:00 2001 From: Akshay Joshi Date: Mon, 5 Dec 2016 13:15:03 +0900 Subject: [PATCH] Quote identifiers correctly in auto-complete. Fixes #1992 --- web/pgadmin/utils/sqlautocomplete/autocomplete.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/pgadmin/utils/sqlautocomplete/autocomplete.py b/web/pgadmin/utils/sqlautocomplete/autocomplete.py index 259c15ea1..baf21466e 100644 --- a/web/pgadmin/utils/sqlautocomplete/autocomplete.py +++ b/web/pgadmin/utils/sqlautocomplete/autocomplete.py @@ -252,7 +252,14 @@ class SQLAutoComplete(object): result = dict() for m in matches: - result[m.completion.display] = {'object_type': m.completion.display_meta} + # Escape name only if meta type is not a keyword and datatype. + if m.completion.display_meta != 'keyword' and \ + m.completion.display_meta != 'datatype': + name = self.escape_name(m.completion.display) + else: + name = m.completion.display + + result[name] = {'object_type': m.completion.display_meta} return result