Author: kmtracey
Date: 2008-10-24 13:13:35 -0500 (Fri, 24 Oct 2008)
New Revision: 9275
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
Log:
[1.0.X] Fixed #9411 -- Changed the test from r9081 to be more robust across
different database backends.
Backport of [9254] from trunk (I neglected to mention in the ticket this
affected 1.0.X branch).
Also updated svnmerge metadata; all eligible fixes have been backported and all
others blocked.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9245
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9274
Modified: django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
===================================================================
--- django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
2008-10-24 16:39:28 UTC (rev 9274)
+++ django/branches/releases/1.0.X/tests/regressiontests/queries/models.py
2008-10-24 18:13:35 UTC (rev 9275)
@@ -974,11 +974,12 @@
>>> expected == result
True
-Make sure bump_prefix() (an internal Query method) doesn't (re-)break.
->>> query = Tag.objects.values_list('id').order_by().query
->>> query.bump_prefix()
->>> print query.as_sql()[0]
-SELECT U0."id" FROM "queries_tag" U0
+Make sure bump_prefix() (an internal Query method) doesn't (re-)break. It's
+sufficient that this query runs without error.
+>>> qs = Tag.objects.values_list('id', flat=True).order_by('id')
+>>> qs.query.bump_prefix()
+>>> list(qs)
+[1, 2, 3, 4, 5]
Calling order_by() with no parameters removes any existing ordering on the
model. But it should still be possible to add new ordering after that.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
