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

Merge pgcli code with version 1.10.3, which is used for auto complete feature.

Browse Source
This commit is contained in:
Akshay Joshi
2018-08-27 15:00:56 +05:30
parent 25679fd542
commit 7a3f3046df
17 changed files with 2191 additions and 1004 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ TableReference = namedtuple(
# This code is borrowed from sqlparse example script.
# <url>
def is_subselect(parsed):
if not parsed.is_group:
if not parsed.is_group():
return False
sql_type = ('SELECT', 'INSERT', 'UPDATE', 'CREATE', 'DELETE')
for item in parsed.tokens:
@@ -104,7 +104,7 @@ def extract_from_part(parsed, stop_at_punctuation=True):
# condition. So we need to ignore the keyword JOIN and its
# variants INNER JOIN, FULL OUTER JOIN, etc.
elif item.ttype is Keyword and (
not item.value.upper() == 'FROM') and (
not item.value.upper() == 'FROM') and (
not item.value.upper().endswith('JOIN')):
tbl_prefix_seen = False
else: