diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/models/options.txt | 4 | ||||
| -rw-r--r-- | docs/releases/3.1.txt | 2 | ||||
| -rw-r--r-- | docs/topics/db/aggregation.txt | 7 |
3 files changed, 2 insertions, 11 deletions
diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt index 87f1e4b15c..e1d927b4e5 100644 --- a/docs/ref/models/options.txt +++ b/docs/ref/models/options.txt @@ -284,10 +284,6 @@ Django quotes column and table names behind the scenes. ordering = [F('author').asc(nulls_last=True)] - Default ordering also affects :ref:`aggregation queries - <aggregation-ordering-interaction>` but this won't be the case starting - in Django 3.1. - .. warning:: Ordering is not a free operation. Each field you add to the ordering diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index 5f6af788ce..9b16bae9ca 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -234,6 +234,8 @@ to remove usage of these features. * ``django.core.paginator.QuerySetPaginator`` is removed. +* A model's ``Meta.ordering`` doesn't affect ``GROUP BY`` queries. + * ``django.contrib.postgres.fields.FloatRangeField`` and ``django.contrib.postgres.forms.FloatRangeField`` are removed. diff --git a/docs/topics/db/aggregation.txt b/docs/topics/db/aggregation.txt index 6e5c6271dd..0a64c703dc 100644 --- a/docs/topics/db/aggregation.txt +++ b/docs/topics/db/aggregation.txt @@ -512,13 +512,6 @@ include the aggregate column. Interaction with default ordering or ``order_by()`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -.. deprecated:: 2.2 - - Starting in Django 3.1, the ordering from a model's ``Meta.ordering`` won't - be used in ``GROUP BY`` queries, such as ``.annotate().values()``. Since - Django 2.2, these queries issue a deprecation warning indicating to add an - explicit ``order_by()`` to the queryset to silence the warning. - Fields that are mentioned in the ``order_by()`` part of a queryset (or which are used in the default ordering on a model) are used when selecting the output data, even if they are not otherwise specified in the ``values()`` |