Skip to content

Commit

Permalink
add NULLS LAST option for Query order (#7341)
Browse files Browse the repository at this point in the history
  • Loading branch information
yoshiokatsuneo authored Feb 25, 2025
1 parent 8387fe6 commit 5df5ca8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions redash/utils/query_order.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
from sqlalchemy.orm.properties import ColumnProperty
from sqlalchemy.orm.query import _ColumnEntity
from sqlalchemy.orm.util import AliasedInsp
from sqlalchemy.sql.expression import asc, desc
from sqlalchemy.sql.expression import asc, desc, nullslast


def get_query_descriptor(query, entity, attr):
Expand Down Expand Up @@ -225,7 +225,7 @@ def __init__(self, silent=True, separator="-"):
def assign_order_by(self, entity, attr, func):
expr = get_query_descriptor(self.query, entity, attr)
if expr is not None:
return self.query.order_by(func(expr))
return self.query.order_by(nullslast(func(expr)))
if not self.silent:
raise QuerySorterException("Could not sort query with expression '%s'" % attr)
return self.query
Expand Down

0 comments on commit 5df5ca8

Please sign in to comment.