summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorFlorian Apolloner <florian@apolloner.eu>2017-07-14 18:11:29 +0200
committerTim Graham <timograham@gmail.com>2017-07-15 09:10:42 -0400
commit9350f77c69a5cef3d7a9b8078ab33ff43335a112 (patch)
treedfcf9ce4877d8d2f2a0d81fb398423e9bb2b780e /docs/ref
parentd9ef8ffb5854c9a5fd81f18b3e383accafd6d7ff (diff)
[1.11.x] Fixed #28399 -- Fixed QuerySet.count() for union(), difference(), and intersection() queries.
Backport of adab280cefb15659c39558ac26ea392b0a1e456c from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/models/querysets.txt14
1 files changed, 9 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()``
~~~~~~~~~~~~~~~~~~