Ticket #24656: django_patch_24656.diff

AUTHORS

@@ -522 +522 @@
     Niclas Olofsson <n@niclasolofsson.se>
     Nicola Larosa <nico@teknico.net>
     Nicolas Lara <nicolaslara@gmail.com>
+    Nicolas Noé <nicolas@niconoe.eu>
     Niran Babalola <niran@niran.org>
     Nis Jørgensen <nis@superlativ.dk>
     Nowell Strite <http://nowell.strite.org/>

docs/ref/models/expressions.txt

@@ -26 +26 @@
 
 .. code-block:: python
 
+    from django.db.models import F, Count
+    from django.db.models.functions import Length
+
     # Find companies that have more employees than chairs.
     Company.objects.filter(num_employees__gt=F('num_chairs'))
 
@@ -62 +65 @@
 Built-in Expressions
 ====================
 
+.. note::
+
+    Technically, these expressions are defined in
+    ``django.db.models.expressions`` and ``django.db.models.aggregate``, but for
+    convenience they're imported into :mod:`django.db.models`.
+
 ``F()`` expressions
 -------------------
 
@@ -88 +97 @@
 the object back to the database. But instead we could also have done::
 
     from django.db.models import F
+
     reporter = Reporters.objects.get(name='Tintin')
     reporter.stories_filed = F('stories_filed') + 1
     reporter.save()
@@ -194 +204 @@
 database functions like ``COALESCE`` and ``LOWER``, or aggregates like ``SUM``.
 They can be used directly::
 
+    from django.db.models import Func, F
+
     queryset.annotate(field_lower=Func(F('field'), function='LOWER'))
 
 or they can be used to build a library of database functions::
@@ -314 +326 @@
 to define ``function``, but you can also completely customize the
 SQL that is generated. Here's a brief example::
 
+    from django.db.models import Aggregate
+
     class Count(Aggregate):
         # supports COUNT(distinct field)
         function = 'COUNT'
@@ -577 +591 @@
         self.expressions = expressions
 
 Let's see how it works::
-
+    >>> from django.db.models import F, Value, CharField
     >>> qs = Company.objects.annotate(
     ...    tagline=Coalesce([
     ...        F('motto'),