Skip to content

Commit

Permalink
fix: questioning a few lines that force an ORDER clause (#11153)
Browse files Browse the repository at this point in the history
* draft: questioning a few lines that force an ORDER clause

* sorting by main metric DESC by default
  • Loading branch information
mistercrunch committed Oct 12, 2020
1 parent dcdf15f commit ae87b0c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ function DatabaseList({ addDangerToast, addSuccessToast }: DatabaseListProps) {
Header: (
<TooltipWrapper
label="allow-dml-header"
tooltip={t('Allow Data Danipulation Language')}
tooltip={t('Allow Data Manipulation Language')}
placement="top"
>
<span>{t('DML')}</span>
Expand Down
3 changes: 0 additions & 3 deletions superset/connectors/sqla/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -1082,9 +1082,6 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
qry = qry.where(and_(*where_clause_and))
qry = qry.having(and_(*having_clause_and))

if not orderby and ((is_sip_38 and metrics) or (not is_sip_38 and not columns)):
orderby = [(main_metric_expr, not order_desc)]

# To ensure correct handling of the ORDER BY labeling we need to reference the
# metric instance if defined in the SELECT clause.
metrics_exprs_by_label = {
Expand Down
4 changes: 4 additions & 0 deletions superset/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -724,6 +724,10 @@ def query_obj(self) -> QueryObjectDict:
if sort_by_label not in d["metrics"]:
d["metrics"].append(sort_by)
d["orderby"] = [(sort_by, not fd.get("order_desc", True))]
elif d["metrics"]:
# Legacy behavior of sorting by first metric by default
first_metric = d["metrics"][0]
d["orderby"] = [(first_metric, not fd.get("order_desc", True))]
return d

def get_data(self, df: pd.DataFrame) -> VizData:
Expand Down

0 comments on commit ae87b0c

Please sign in to comment.