fix macbre#390 AttributeError: 'NoneType' object has no attribute 'no…

…rmalized'
Byunk · Oct 11, 2023 · d1b4984 · d1b4984
1 parent 366a8b5
commit d1b4984
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/sql_metadata/parser.py b/sql_metadata/parser.py
@@ -426,6 +426,7 @@ def tables_aliases(self) -> Dict[str, str]:
                 token.last_keyword_normalized in TABLE_ADJUSTMENT_KEYWORDS
                 and (token.is_name or (token.is_keyword and not token.is_as_keyword))
                 and not token.next_token.is_as_keyword
+                and not token.value in RELEVANT_KEYWORDS
             ):
                 if token.previous_token.is_as_keyword:
                     # potential <DB.<SCHEMA>.<TABLE> as <ALIAS>

diff --git a/sql_metadata/token.py b/sql_metadata/token.py
@@ -228,6 +228,10 @@ def is_alias_of_self(self) -> bool:
             end_of_column = end_of_column.find_nearest_token(
                 [",", "FROM"], value_attribute="normalized", direction="right"
             )
+
+        if end_of_column is EmptyToken:
+            return False
+
         return end_of_column.previous_token.normalized == self.normalized
 
     @property