Skip to content

Commit

Permalink
fix: extract tables doesn't work with reserved keywords
Browse files Browse the repository at this point in the history
  • Loading branch information
betodealmeida committed Dec 6, 2021
1 parent 8e02d11 commit da9f4b1
Show file tree
Hide file tree
Showing 3 changed files with 1,072 additions and 762 deletions.
16 changes: 15 additions & 1 deletion superset/sql_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,11 @@ def _extract_from_token(self, token: Token) -> None:

table_name_preceding_token = False

# If the table name is a reserved word (eg, "table_name") it won't be returned. We
# fix this by ensuring that at least one identifier is returned after the FROM
# before stopping on a keyword.
has_processed_identifier = False

for item in token.tokens:
if item.is_group and (
not self._is_identifier(item) or isinstance(item.tokens[0], Parenthesis)
Expand All @@ -318,16 +323,25 @@ def _extract_from_token(self, token: Token) -> None:
table_name_preceding_token = True
continue

if item.ttype in Keyword:
# If we haven't processed any identifiers it means the table name is a
# reserved keyword (eg, "table_name") and we shouldn't stop.
if item.ttype in Keyword and has_processed_identifier:
table_name_preceding_token = False
continue
if table_name_preceding_token:
if isinstance(item, Identifier):
self._process_tokenlist(item)
has_processed_identifier = True
elif isinstance(item, IdentifierList):
for token2 in item.get_identifiers():
if isinstance(token2, TokenList):
self._process_tokenlist(token2)
has_processed_identifier = True
elif item.ttype in Keyword:
# convert into an identifier
fixed = Identifier([Token(Name, item.value)])
self._process_tokenlist(fixed)
has_processed_identifier = True
elif isinstance(item, IdentifierList):
if any(not self._is_identifier(token2) for token2 in item.tokens):
self._extract_from_token(item)
Expand Down
Loading

0 comments on commit da9f4b1

Please sign in to comment.