From 47ef8f31f30a2b1920f82494d729c285565867dd Mon Sep 17 00:00:00 2001 From: Yohann Gabory Date: Wed, 27 Jul 2016 15:17:05 +0200 Subject: Fixed #13312 -- Allowed specifying the order of null fields in queries. Thanks Mariusz Felisiak for finishing the patch. --- docs/ref/models/expressions.txt | 16 ++++++++++++++-- docs/releases/1.11.txt | 5 +++++ 2 files changed, 19 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/ref/models/expressions.txt b/docs/ref/models/expressions.txt index 91786b3622..e46df22f98 100644 --- a/docs/ref/models/expressions.txt +++ b/docs/ref/models/expressions.txt @@ -560,14 +560,26 @@ calling the appropriate methods on the wrapped expression. nested expressions. ``F()`` objects, in particular, hold a reference to a column. - .. method:: asc() + .. method:: asc(nulls_first=False, nulls_last=False) Returns the expression ready to be sorted in ascending order. - .. method:: desc() + ``nulls_first`` and ``nulls_last`` define how null values are sorted. + + .. versionchanged:: 1.11 + + The ``nulls_last`` and ``nulls_first`` parameters were added. + + .. method:: desc(nulls_first=False, nulls_last=False) Returns the expression ready to be sorted in descending order. + ``nulls_first`` and ``nulls_last`` define how null values are sorted. + + .. versionchanged:: 1.11 + + The ``nulls_first`` and ``nulls_last`` parameters were added. + .. method:: reverse_ordering() Returns ``self`` with any modifications required to reverse the sort diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt index 59b7fb54f9..2035588af6 100644 --- a/docs/releases/1.11.txt +++ b/docs/releases/1.11.txt @@ -337,6 +337,11 @@ Models * You can now use the ``unique=True`` option with :class:`~django.db.models.FileField`. +* Added the ``nulls_first`` and ``nulls_last`` parameters to + :class:`Expression.asc() ` and + :meth:`~django.db.models.Expression.desc` to control + the ordering of null values. + Requests and Responses ~~~~~~~~~~~~~~~~~~~~~~ -- cgit v1.3