Django

Code

Changeset 7468

Show
Ignore:
Timestamp:
04/26/08 04:06:56 (2 months ago)
Author:
mtredinnick
Message:

queryset-refactor: Repaired the dates() method with extra(select=...).xi
It was broken by [7340]. Patch from Ian Kelly. Fixed #7087.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/django/db/models/sql/subqueries.py

    r7454 r7468  
    331331            needs_string_cast = self.connection.features.needs_datetime_string_cast 
    332332 
     333        offset = len(self.extra_select) 
    333334        for rows in self.execute_sql(MULTI): 
    334335            for row in rows: 
    335                 date = row[0] 
     336                date = row[offset] 
    336337                if resolve_columns: 
    337338                    date = self.resolve_columns([date], fields)[0] 

  • django/branches/queryset-refactor/tests/regressiontests/queries/models.py

    r7462 r7468  
    587587[<Tag: t1>, <Tag: t2>, <Tag: t3>, <Tag: t4>, <Tag: t5>] 
    588588 
    589 Bug #6180, #6203 
     589Bug #6180, #6203 -- dates with limits and/or counts 
    590590>>> Item.objects.count() 
    5915914 
    …… 
    599599datetime.datetime(2007, 12, 19, 0, 0) 
    600600 
     601Bug #7087 -- dates with extra select columns 
     602>>> Item.objects.dates('created', 'day').extra(select={'a': 1}) 
     603[datetime.datetime(2007, 12, 19, 0, 0), datetime.datetime(2007, 12, 20, 0, 0)] 
     604 
    601605Test that parallel iterators work. 
    602606