Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
add check inside exception
Browse files Browse the repository at this point in the history
hughhhh committed Oct 14, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent df3b5a8 commit f626856
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions superset/sqllab/command.py
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
from __future__ import annotations

import logging
from typing import Any, Dict, Optional, TYPE_CHECKING
from typing import Any, Dict, Optional, Set, TYPE_CHECKING

from flask_babel import gettext as __

@@ -53,6 +53,13 @@

CommandResult = Dict[str, Any]

# Define set of users client errors these definitions won't
# be logged as exception vs. warning
USER_CLIENT_ERRORS: Set[SupersetErrorType] = {
SupersetErrorType.SYNTAX_ERROR,
SupersetErrorType.COLUMN_DOES_NOT_EXIST_ERROR,
}


class ExecuteSqlCommand(BaseCommand):
_execution_context: SqlJsonExecutionContext
@@ -116,11 +123,11 @@ def run( # pylint: disable=too-many-statements,useless-suppression
"payload": self._execution_context_convertor.serialize_payload(),
}
except SupersetErrorsException as ex:
if all(ex.error_type == SupersetErrorType.SYNTAX_ERROR for ex in ex.errors):
if all(ex.error_type in USER_CLIENT_ERRORS for ex in ex.errors):
raise SupersetSyntaxErrorException(ex.errors) from ex
raise ex
except SupersetException as ex:
if ex.error_type == SupersetErrorType.SYNTAX_ERROR:
if ex.error_type in USER_CLIENT_ERRORS:
raise SupersetSyntaxErrorException(
[
SupersetError(

0 comments on commit f626856

Please sign in to comment.