Django

Code

Changeset 6512

Show
Ignore:
Timestamp:
10/14/07 19:29:55 (1 year ago)
Author:
mtredinnick
Message:

queryset-refactor: Fixed a couple of typos that were messing up extra(select=...).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/django/db/models/query.py

    r6511 r6512  
    9797                obj = self.model(*row[:index_end]) 
    9898            for i, k in enumerate(extra_select): 
    99                 setattr(obj, k[0], row[index_end + i]) 
     99                setattr(obj, k, row[index_end + i]) 
    100100            yield obj 
    101101 

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

    r6511 r6512  
    343343        qn = self.quote_name_unless_alias 
    344344        result = [] 
    345         if self.select or self.extra_select: 
     345        if self.select: 
    346346            for col in self.select: 
    347347                if isinstance(col, (list, tuple)): 

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

    r6511 r6512  
    311311[<Ranking: 1: a3>, <Ranking: 2: a2>, <Ranking: 3: a1>] 
    312312 
     313>>> qs = Ranking.objects.extra(select={'good': 'rank > 2'}) 
     314>>> [o.good for o in qs.extra(order_by=('-good',))] == [True, False, False] 
     315True 
     316>>> qs.extra(order_by=('-good', 'id')) 
     317[<Ranking: 3: a1>, <Ranking: 2: a2>, <Ranking: 1: a3>] 
     318 
    313319Bugs #2874, #3002 
    314320>>> qs = Item.objects.select_related().order_by('note__note', 'name')