[1.1.X] Fixed #13455 -- Clarified the interaction of values() and extra(). Thanks to Rupe for the report and draft text.

Backport of r13145 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13151 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 1 deletions

diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt
index e271543aa7..698b1f2388 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -414,6 +414,11 @@ A couple of subtleties that are worth mentioning:
     * When using ``values()`` together with ``distinct()``, be aware that
       ordering can affect the results. See the note in the `distinct()`_
       section, above, for details.
+    * If you use a ``values()`` clause after an ``extra()`` clause,
+      any fields defined by a ``select`` argument in the ``extra()``
+      must be explicitly included in the ``values()`` clause. However,
+      if the ``extra()`` clause is used after the ``values()``, the
+      fields added by the select will be included automatically.
 
 .. versionadded:: 1.0
 
@@ -1330,7 +1335,7 @@ SQL equivalent::
 
     SELECT ... WHERE id > 4;
 
-.. fieldlookup:: gte 
+.. fieldlookup:: gte
 
 gte
 ~~~