Django

Code

Changeset 6517

Show
Ignore:
Timestamp:
10/14/07 22:31:37 (1 year ago)
Author:
mtredinnick
Message:

queryset-refactor: Fixed values(...).select_related(...) bug that was
introduced in [6512]. The lookup tests picked this up.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r6516 r6517  
    417417 
    418418        self.query.add_local_columns([f.column for f in fields]) 
     419        self.query.default_cols = False 
    419420        self.field_names = field_names 
    420421 

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

    r6515 r6517  
    7676        self.join_map = {}      # Maps join_tuple to list of aliases. 
    7777        self.rev_join_map = {}  # Reverse of join_map. 
     78        self.default_cols = True 
    7879 
    7980        # SQL-related attributes 
    …… 
    130131        obj.join_map = copy.deepcopy(self.join_map) 
    131132        obj.rev_join_map = copy.deepcopy(self.rev_join_map) 
     133        obj.default_cols = self.default_cols 
    132134        obj.select = self.select[:] 
    133135        obj.tables = self.tables[:] 
    …… 
    354356                    if hasattr(col, 'alias'): 
    355357                        aliases.append(col.alias) 
    356         else: 
     358        elif self.default_cols: 
    357359            table_alias = self.tables[0] 
    358360            result = ['%s.%s' % (qn(table_alias), qn(f.column))