mirror of
https://github.com/apache/superset.git
synced 2026-04-20 00:24:38 +00:00
fix: Saved queries list break if one query can't be parsed (#34289)
This commit is contained in:
committed by
GitHub
parent
9b88527883
commit
1e5a4e9bdc
@@ -48,7 +48,7 @@ from sqlalchemy.orm import backref, relationship
|
|||||||
from sqlalchemy.sql.elements import ColumnElement, literal_column
|
from sqlalchemy.sql.elements import ColumnElement, literal_column
|
||||||
|
|
||||||
from superset import security_manager
|
from superset import security_manager
|
||||||
from superset.exceptions import SupersetSecurityException
|
from superset.exceptions import SupersetParseError, SupersetSecurityException
|
||||||
from superset.jinja_context import BaseTemplateProcessor, get_template_processor
|
from superset.jinja_context import BaseTemplateProcessor, get_template_processor
|
||||||
from superset.models.helpers import (
|
from superset.models.helpers import (
|
||||||
AuditMixinNullable,
|
AuditMixinNullable,
|
||||||
@@ -85,7 +85,7 @@ class SqlTablesMixin: # pylint: disable=too-few-public-methods
|
|||||||
self.database, # type: ignore
|
self.database, # type: ignore
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
except (SupersetSecurityException, TemplateError):
|
except (SupersetSecurityException, SupersetParseError, TemplateError):
|
||||||
return []
|
return []
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ from jinja2.exceptions import TemplateError
|
|||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
|
from superset.errors import ErrorLevel, SupersetError, SupersetErrorType
|
||||||
from superset.exceptions import SupersetSecurityException
|
from superset.exceptions import SupersetParseError, SupersetSecurityException
|
||||||
from superset.models.sql_lab import Query, SavedQuery
|
from superset.models.sql_lab import Query, SavedQuery
|
||||||
|
|
||||||
|
|
||||||
@@ -43,6 +43,10 @@ from superset.models.sql_lab import Query, SavedQuery
|
|||||||
level=ErrorLevel.ERROR,
|
level=ErrorLevel.ERROR,
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
SupersetParseError(
|
||||||
|
sql="INVALID SQL",
|
||||||
|
message="Invalid SQL syntax",
|
||||||
|
),
|
||||||
TemplateError,
|
TemplateError,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
@@ -57,3 +61,42 @@ def test_sql_tables_mixin_sql_tables_exception(
|
|||||||
)
|
)
|
||||||
|
|
||||||
assert klass(sql="SELECT 1", database=MagicMock()).sql_tables == []
|
assert klass(sql="SELECT 1", database=MagicMock()).sql_tables == []
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"klass",
|
||||||
|
[
|
||||||
|
Query,
|
||||||
|
SavedQuery,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
@pytest.mark.parametrize(
|
||||||
|
"invalid_sql",
|
||||||
|
[
|
||||||
|
"SELECT * FROM table WHERE invalid syntax",
|
||||||
|
"INVALID SQL STATEMENT",
|
||||||
|
"SELECT * FROM; DROP TABLE users;",
|
||||||
|
"",
|
||||||
|
None,
|
||||||
|
],
|
||||||
|
)
|
||||||
|
def test_sql_tables_mixin_invalid_sql_returns_empty_list(
|
||||||
|
klass: type[Model],
|
||||||
|
invalid_sql: str,
|
||||||
|
mocker: MockerFixture,
|
||||||
|
) -> None:
|
||||||
|
"""Test that SqlTablesMixin returns empty list when SQL parsing fails."""
|
||||||
|
mocker.patch(
|
||||||
|
"superset.models.sql_lab.extract_tables_from_jinja_sql",
|
||||||
|
side_effect=SupersetParseError(
|
||||||
|
sql=invalid_sql or "INVALID SQL",
|
||||||
|
message=f"Failed to parse SQL: {invalid_sql}",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
instance = (
|
||||||
|
klass(sql=invalid_sql, database=MagicMock())
|
||||||
|
if invalid_sql is not None
|
||||||
|
else klass(database=MagicMock())
|
||||||
|
)
|
||||||
|
assert instance.sql_tables == []
|
||||||
|
|||||||
Reference in New Issue
Block a user