QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-24 18:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix sqlparse bug and refactor (#5768)

Browse Source
This commit is contained in:
timifasubaa
2018-08-29 08:30:49 -07:00
committed by Grace Guo
parent 135539c109
commit d5d592788c
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset/sql_parse.py
View File

@@ -11,7 +11,7 @@ import sqlparse
from sqlparse.sql import Identifier, IdentifierList
from sqlparse.tokens import Keyword, Name
RESULT_OPERATIONS = {'UNION', 'INTERSECT', 'EXCEPT'}
RESULT_OPERATIONS = {'UNION', 'INTERSECT', 'EXCEPT', 'SELECT'}
ON_KEYWORD = 'ON'
PRECEDES_TABLE_NAME = {'FROM', 'JOIN', 'DESC', 'DESCRIBE', 'WITH'}
@@ -128,7 +128,7 @@ class SupersetQuery(object):
if not table_name_preceding_token:
continue
if item.ttype in Keyword:
if item.ttype in Keyword or item.value == ',':
if (self.__is_result_operation(item.value) or
item.value.upper() == ON_KEYWORD):
table_name_preceding_token = False