diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/models/querysets.txt | 14 | ||||
| -rw-r--r-- | docs/releases/1.11.4.txt | 3 |
2 files changed, 12 insertions, 5 deletions
diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index 951d91098c..082861f61b 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -822,11 +822,15 @@ of other models. Passing different models works as long as the ``SELECT`` list is the same in all ``QuerySet``\s (at least the types, the names don't matter as long as the types in the same order). -In addition, only ``LIMIT``, ``OFFSET``, and ``ORDER BY`` (i.e. slicing and -:meth:`order_by`) are allowed on the resulting ``QuerySet``. Further, databases -place restrictions on what operations are allowed in the combined queries. For -example, most databases don't allow ``LIMIT`` or ``OFFSET`` in the combined -queries. +In addition, only ``LIMIT``, ``OFFSET``, ``COUNT(*)``, and ``ORDER BY`` (i.e. +slicing, :meth:`count`, and :meth:`order_by`) are allowed on the resulting +``QuerySet``. Further, databases place restrictions on what operations are +allowed in the combined queries. For example, most databases don't allow +``LIMIT`` or ``OFFSET`` in the combined queries. + +.. versionchanged:: 1.11.4 + + ``COUNT(*)`` support was added. ``intersection()`` ~~~~~~~~~~~~~~~~~~ diff --git a/docs/releases/1.11.4.txt b/docs/releases/1.11.4.txt index c64f5c9c6f..8952ce1c4b 100644 --- a/docs/releases/1.11.4.txt +++ b/docs/releases/1.11.4.txt @@ -25,3 +25,6 @@ Bugfixes * Corrected ``Field.has_changed()`` to return ``False`` for disabled form fields: ``BooleanField``, ``MultipleChoiceField``, ``MultiValueField``, ``FileField``, ``ModelChoiceField``, and ``ModelMultipleChoiceField``. + +* Fixed ``QuerySet.count()`` for ``union()``, ``difference()``, and + ``intersection()`` queries. (:ticket:`28399`). |