IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-20 11:48:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure compatibility with newer sqlparse modules. Fixes #1725

Browse Source
This commit is contained in:
Murtuza Zabuawala 2016-09-26 13:49:54 +01:00 committed by Dave Page
parent e591c6b5c0
commit a0a6428e86
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web/pgadmin/utils/sqlautocomplete/autocomplete.py
View File

@ -671,6 +671,11 @@ class SQLAutoComplete(object):
full_text, identifier)
def suggest_based_on_last_token(self, token, text_before_cursor, full_text, identifier):
# New version of sqlparse sends tuple, we need to make it
# compatible with our logic
if isinstance(token, tuple) and len(token) > 1:
token = token[1]
if isinstance(token, string_types):
token_v = token.lower()
elif isinstance(token, Comparison):

2
web/pgadmin/utils/sqlautocomplete/parseutils.py
View File

@ -275,7 +275,7 @@ def parse_partial_identifier(word):
n_tok = len(p.tokens)
if n_tok == 1 and isinstance(p.tokens[0], Identifier):
return p.tokens[0]
elif p.token_next_match(0, Error, '"'):
elif hasattr(p, 'token_next_match') and p.token_next_match(0, Error, '"'):
# An unmatched double quote, e.g. '"foo', 'foo."', or 'foo."bar'
# Close the double quote, then reparse
return parse_partial_identifier(word + '"')