Commit 47f1330b authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in a... 

[1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one.

Backport of r11748 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 4cba4362

django/db/models/sql/subqueries.py

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ class DateQuery(Query): 
        self.select = [select]

        self.select_fields = [None]

        self.select_related = False # See #7097.

        self.extra = {}

        self.set_extra_mask([])

        self.distinct = True

        self.order_by = order == 'ASC' and [1] or [-1]

tests/regressiontests/queries/models.py

+11 −1
Original line number Diff line number Diff line
@@ -755,10 +755,20 @@ Bug #6180, #6203 -- dates with limits and/or counts 
>>> Item.objects.dates('created', 'day')[0]

datetime.datetime(2007, 12, 19, 0, 0)



Bug #7087 -- dates with extra select columns

Bug #7087/#12242 -- 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)]



>>> Item.objects.extra(select={'a': 1}).dates('created', 'day')

[datetime.datetime(2007, 12, 19, 0, 0), datetime.datetime(2007, 12, 20, 0, 0)]



>>> name="one"

>>> Item.objects.dates('created', 'day').extra(where=['name=%s'], params=[name])

[datetime.datetime(2007, 12, 19, 0, 0)]



>>> Item.objects.extra(where=['name=%s'], params=[name]).dates('created', 'day')

[datetime.datetime(2007, 12, 19, 0, 0)]



Bug #7155 -- nullable dates

>>> Item.objects.dates('modified', 'day')

[datetime.datetime(2007, 12, 19, 0, 0)]