[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
This commit is contained in:
Russell Keith-Magee 2010-05-09 04:33:29 +00:00
parent 0711e1051d
commit a1421336d7
1 changed files with 6 additions and 1 deletions

View File

@ -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