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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13145 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-05-09 04:24:21 +00:00
parent 663d17897e
commit e7e46d1f4b
1 changed files with 6 additions and 1 deletions

View File

@ -418,6 +418,11 @@ A couple of subtleties that are worth mentioning:
* When using ``values()`` together with ``distinct()``, be aware that * When using ``values()`` together with ``distinct()``, be aware that
ordering can affect the results. See the note in the `distinct()`_ ordering can affect the results. See the note in the `distinct()`_
section, above, for details. 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 .. versionadded:: 1.0
@ -1383,7 +1388,7 @@ SQL equivalent::
SELECT ... WHERE id > 4; SELECT ... WHERE id > 4;
.. fieldlookup:: gte .. fieldlookup:: gte
gte gte
~~~ ~~~