graceguo-supercat closed pull request #5768: fix sqlparse bug and refactor
URL: https://github.com/apache/incubator-superset/pull/5768
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/superset/sql_parse.py b/superset/sql_parse.py
index ccef3505b4..240a30cb6e 100644
--- a/superset/sql_parse.py
+++ b/superset/sql_parse.py
@@ -11,7 +11,7 @@
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 @@ def __extract_from_token(self, token):
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
diff --git a/tests/sql_parse_tests.py b/tests/sql_parse_tests.py
index 5306760a49..3f66fedb43 100644
--- a/tests/sql_parse_tests.py
+++ b/tests/sql_parse_tests.py
@@ -338,3 +338,40 @@ def test_complex_extract_tables2(self):
self.assertEquals(
{'table_a', 'table_b', 'table_c'},
self.extract_tables(query))
+
+ def test_complex_extract_tables3(self):
+ query = """SELECT somecol AS somecol
+ FROM
+ (WITH bla AS
+ (SELECT col_a
+ FROM a
+ WHERE 1=1
+ AND column_of_choice NOT IN
+ ( SELECT interesting_col
+ FROM b ) ),
+ rb AS
+ ( SELECT yet_another_column
+ FROM
+ ( SELECT a
+ FROM c
+ GROUP BY the_other_col ) not_table
+ LEFT JOIN bla foo ON foo.prop = not_table.bad_col0
+ WHERE 1=1
+ GROUP BY not_table.bad_col1 ,
+ not_table.bad_col2 ,
+ ORDER BY not_table.bad_col_3 DESC , not_table.bad_col4 ,
+ not_table.bad_col5) SELECT
random_col
+ FROM d
+ WHERE 1=1
+ UNION ALL SELECT even_more_cols
+ FROM e
+ WHERE 1=1
+ UNION ALL SELECT lets_go_deeper
+ FROM f
+ WHERE 1=1
+ WHERE 2=2
+ GROUP BY last_col
+ LIMIT 50000;"""
+ self.assertEquals(
+ {'a', 'b', 'c', 'd', 'e', 'f'},
+ self.extract_tables(query))
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
