QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 16:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: invalid metric should raise an exception (#20882)

Browse Source
This commit is contained in:
Yongjie Zhao
2022-07-28 08:15:43 +08:00
committed by GitHub
parent 383313b105
commit 718bc3062e
7 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
superset/utils/core.py
View File

@@ -1294,7 +1294,7 @@ def get_metric_name(
sql_expression = metric.get("sqlExpression")
if sql_expression:
return sql_expression
elif expression_type == "SIMPLE":
if expression_type == "SIMPLE":
column: AdhocMetricColumn = metric.get("column") or {}
column_name = column.get("column_name")
aggregate = metric.get("aggregate")
@@ -1302,10 +1302,12 @@ def get_metric_name(
return f"{aggregate}({column_name})"
if column_name:
return column_name
raise ValueError(__("Invalid metric object"))
verbose_map = verbose_map or {}
return verbose_map.get(metric, metric) # type: ignore
if isinstance(metric, str):
verbose_map = verbose_map or {}
return verbose_map.get(metric, metric)
raise ValueError(__("Invalid metric object: %(metric)s", metric=str(metric)))
def get_column_names(