Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

queryset-refactor: Repaired the dates() method with extra(select=...).xi

It was broken by [7340]. Patch from Ian Kelly. Fixed #7087.


git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bb132aa3951c3d3582be608d9bb7af5a707bf6e6 1 parent dd432cc
@malcolmt malcolmt authored
View
3  django/db/models/sql/subqueries.py
@@ -330,9 +330,10 @@ def results_iter(self):
from django.db.backends.util import typecast_timestamp
needs_string_cast = self.connection.features.needs_datetime_string_cast
+ offset = len(self.extra_select)
for rows in self.execute_sql(MULTI):
for row in rows:
- date = row[0]
+ date = row[offset]
if resolve_columns:
date = self.resolve_columns([date], fields)[0]
elif needs_string_cast:
View
6 tests/regressiontests/queries/models.py
@@ -586,7 +586,7 @@ class Meta:
>>> Tag.objects.select_related('parent').order_by('name')
[<Tag: t1>, <Tag: t2>, <Tag: t3>, <Tag: t4>, <Tag: t5>]
-Bug #6180, #6203
+Bug #6180, #6203 -- dates with limits and/or counts
>>> Item.objects.count()
4
>>> Item.objects.dates('created', 'month').count()
@@ -598,6 +598,10 @@ class Meta:
>>> Item.objects.dates('created', 'day')[0]
datetime.datetime(2007, 12, 19, 0, 0)
+Bug #7087 -- dates with extra select columns
+>>> Item.objects.dates('created', 'day').extra(select={'a': 1})
+[datetime.datetime(2007, 12, 19, 0, 0), datetime.datetime(2007, 12, 20, 0, 0)]
+
Test that parallel iterators work.
>>> qs = Tag.objects.all()
Please sign in to comment.
Something went wrong with that request. Please try again.