Django

Code

Changeset 7438

Show
Ignore:
Timestamp:
04/20/08 03:47:41 (7 months ago)
Author:
mtredinnick
Message:

queryset-refactor: Fixed db column to model field mapping for Oracle backend.
Thanks, Justin Bronn. Fixed #7036.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/queryset-refactor/django/db/backends/oracle/query.py

    r7427 r7438  
    2929            from django.db.models.fields import DateField, DateTimeField, \ 
    3030                 TimeField, BooleanField, NullBooleanField, DecimalField, Field 
     31            index_start = len(self.extra_select.keys()) 
    3132            values = [] 
    32             for value, field in map(None, row, fields): 
     33            for value, field in map(None, row[index_start:], fields): 
    3334                if isinstance(value, Database.LOB): 
    3435                    value = value.read() 
    …… 
    112113            self.extra_select['rn'] = 'ROW_NUMBER() OVER (ORDER BY %s )' % rn_orderby 
    113114            sql, params= super(OracleQuery, self).as_sql(with_limits=False) 
    114             self.extra_select.pop('rn') 
    115115 
    116116            # Constructing the result SQL, using the initial select SQL