Author: russellm
Date: 2010-05-08 23:33:29 -0500 (Sat, 08 May 2010)
New Revision: 13151

Modified:
   django/branches/releases/1.1.X/docs/ref/models/querysets.txt
Log:
[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.

Modified: django/branches/releases/1.1.X/docs/ref/models/querysets.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/models/querysets.txt        
2010-05-09 04:32:40 UTC (rev 13150)
+++ django/branches/releases/1.1.X/docs/ref/models/querysets.txt        
2010-05-09 04:33:29 UTC (rev 13151)
@@ -414,6 +414,11 @@
     * 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 @@
 
     SELECT ... WHERE id > 4;
 
-.. fieldlookup:: gte 
+.. fieldlookup:: gte
 
 gte
 ~~~

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to