Django

Code

Changeset 3130

Show
Ignore:
Timestamp:
06/15/06 06:28:28 (2 years ago)
Author:
mtredinnick
Message:

Fixed #2164 -- Create correct SQL when pk column name is not the same as the
attribute name. Thanks, Russell Cloran.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/models/base.py

    r3118 r3130  
    166166                    (backend.quote_name(self._meta.db_table), 
    167167                    ','.join(['%s=%%s' % backend.quote_name(f.column) for f in non_pks]), 
    168                     backend.quote_name(self._meta.pk.attname)), 
     168                    backend.quote_name(self._meta.pk.column)), 
    169169                    db_values + [pk_val]) 
    170170            else: 

  • django/trunk/tests/modeltests/custom_pk/models.py

    r3075 r3130  
    99 
    1010class Employee(models.Model): 
    11     employee_code = models.CharField(maxlength=10, primary_key=True) 
     11    employee_code = models.CharField(maxlength=10, primary_key=True, 
     12            db_column = 'code') 
    1213    first_name = models.CharField(maxlength=20) 
    1314    last_name = models.CharField(maxlength=20)