summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-01-08 05:51:15 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2009-01-08 05:51:15 +0000
commitcc76b89c5967e77fcbb4f0772526387066822497 (patch)
treed3266621e72b3054ecc2b235b9d3178d005fabdd /tests
parentfe9cd02f383841de6a758cd2f796bb93f2cfabc1 (diff)
[1.0.X] Fixed #9985 -- qs.values_list(...).values(...) was constructing incorrect SQL.
Backport of r9717 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9718 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
-rw-r--r--tests/regressiontests/queries/models.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py
index 868200f60c..50d81479a5 100644
--- a/tests/regressiontests/queries/models.py
+++ b/tests/regressiontests/queries/models.py
@@ -1020,6 +1020,10 @@ cases).
# optimise the inner query without losing results.
>>> Annotation.objects.exclude(tag__children__name="t2")
[<Annotation: a2>]
+
+Bug #9985 -- qs.values_list(...).values(...) combinations should work.
+>>> Note.objects.values_list("note", flat=True).values("id").order_by("id")
+[{'id': 1}, {'id': 2}, {'id': 3}]
"""}
# In Python 2.3 and the Python 2.6 beta releases, exceptions raised in __len__