Commit a1421336 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #13455 -- Clarified the interaction of values() and extra().... 

[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
parent 0711e105

docs/ref/models/querysets.txt

+6 −1
Original line number Diff line number Diff line
@@ -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