Author: mtredinnick
Date: 2007-10-14 19:29:55 -0500 (Sun, 14 Oct 2007)
New Revision: 6512
Modified:
django/branches/queryset-refactor/django/db/models/query.py
django/branches/queryset-refactor/django/db/models/sql/query.py
django/branches/queryset-refactor/tests/regressiontests/queries/models.py
Log:
queryset-refactor: Fixed a couple of typos that were messing up
extra(select=...).
Modified: django/branches/queryset-refactor/django/db/models/query.py
===================================================================
--- django/branches/queryset-refactor/django/db/models/query.py 2007-10-15
00:29:27 UTC (rev 6511)
+++ django/branches/queryset-refactor/django/db/models/query.py 2007-10-15
00:29:55 UTC (rev 6512)
@@ -96,7 +96,7 @@
else:
obj = self.model(*row[:index_end])
for i, k in enumerate(extra_select):
- setattr(obj, k[0], row[index_end + i])
+ setattr(obj, k, row[index_end + i])
yield obj
def count(self):
Modified: django/branches/queryset-refactor/django/db/models/sql/query.py
===================================================================
--- django/branches/queryset-refactor/django/db/models/sql/query.py
2007-10-15 00:29:27 UTC (rev 6511)
+++ django/branches/queryset-refactor/django/db/models/sql/query.py
2007-10-15 00:29:55 UTC (rev 6512)
@@ -342,7 +342,7 @@
"""
qn = self.quote_name_unless_alias
result = []
- if self.select or self.extra_select:
+ if self.select:
for col in self.select:
if isinstance(col, (list, tuple)):
result.append('%s.%s' % (qn(col[0]), qn(col[1])))
Modified:
django/branches/queryset-refactor/tests/regressiontests/queries/models.py
===================================================================
--- django/branches/queryset-refactor/tests/regressiontests/queries/models.py
2007-10-15 00:29:27 UTC (rev 6511)
+++ django/branches/queryset-refactor/tests/regressiontests/queries/models.py
2007-10-15 00:29:55 UTC (rev 6512)
@@ -310,6 +310,12 @@
>>> Ranking.objects.extra(tables=['django_site'], order_by=['-django_site.id',
>>> 'rank'])
[<Ranking: 1: a3>, <Ranking: 2: a2>, <Ranking: 3: a1>]
+>>> qs = Ranking.objects.extra(select={'good': 'rank > 2'})
+>>> [o.good for o in qs.extra(order_by=('-good',))] == [True, False, False]
+True
+>>> qs.extra(order_by=('-good', 'id'))
+[<Ranking: 3: a1>, <Ranking: 2: a2>, <Ranking: 1: a3>]
+
Bugs #2874, #3002
>>> qs = Item.objects.select_related().order_by('note__note', 'name')
>>> list(qs)
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
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
-~----------~----~----~----~------~----~------~--~---
