Skip to content

Commit

Permalink
fix: raise unexpected error when orderby is empty (apache#15353)
Browse files Browse the repository at this point in the history
* fix: raise unexpected error when orderby is empty

* fix ut
  • Loading branch information
zhaoyongjie authored and cccs-RyanS committed Dec 17, 2021
1 parent cd7d889 commit b30ea22
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions superset/charts/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -1007,11 +1007,21 @@ class Meta: # pylint: disable=too-few-public-methods
allow_none=True,
)
orderby = fields.List(
fields.List(fields.Raw()),
fields.Tuple(
(
fields.Raw(
validate=[
Length(min=1, error=_("orderby column must be populated"))
],
allow_none=False,
),
fields.Boolean(),
)
),
description="Expects a list of lists where the first element is the column "
"name which to sort by, and the second element is a boolean.",
allow_none=True,
example=[["my_col_1", False], ["my_col_2", True]],
example=[("my_col_1", False), ("my_col_2", True)],
)
where = fields.String(
description="WHERE clause to be added to queries using AND operator."
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/query_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"groupby": ["name"],
"metrics": [{"label": "sum__num"}],
"orderby": [["sum__num", False]],
"orderby": [("sum__num", False)],
"row_limit": 100,
"granularity": "ds",
"time_range": "100 years ago : now",
Expand Down

0 comments on commit b30ea22

Please sign in to comment.