From efae3e7ce53d17146169f03a29738c6b5c4f4d57 Mon Sep 17 00:00:00 2001 From: mapledan Date: Thu, 1 Feb 2024 10:07:43 +0800 Subject: [PATCH] fix: handle CRLF endings causing sqlglot failure (#26911) (cherry picked from commit f2bf9f72e4f17604f5db80f25815525236a7269a) --- superset/sql_parse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/superset/sql_parse.py b/superset/sql_parse.py index 080572eba1576..771ca32928ac1 100644 --- a/superset/sql_parse.py +++ b/superset/sql_parse.py @@ -283,7 +283,7 @@ def _extract_tables_from_sql(self) -> set[Table]: Note: this uses sqlglot, since it's better at catching more edge cases. """ try: - statements = parse(self.sql, dialect=self._dialect) + statements = parse(self.stripped(), dialect=self._dialect) except ParseError: logger.warning("Unable to parse SQL (%s): %s", self._dialect, self.sql) return set() @@ -493,7 +493,7 @@ def is_unknown(self) -> bool: return self._parsed[0].get_type() == "UNKNOWN" def stripped(self) -> str: - return self.sql.strip(" \t\n;") + return self.sql.strip(" \t\r\n;") def strip_comments(self) -> str: return sqlparse.format(self.stripped(), strip_comments=True)