Commit 28e64374 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #2164 -- Create correct SQL when pk column name is not the same as the 

attribute name. Thanks, Russell Cloran.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3130 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 8938d5ee

django/db/models/base.py

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ class Model(object): 
                cursor.execute("UPDATE %s SET %s WHERE %s=%%s" % \

                    (backend.quote_name(self._meta.db_table),

                    ','.join(['%s=%%s' % backend.quote_name(f.column) for f in non_pks]),

                    backend.quote_name(self._meta.pk.attname)),

                    backend.quote_name(self._meta.pk.column)),

                    db_values + [pk_val])

            else:

                record_exists = False

tests/modeltests/custom_pk/models.py

+2 −1
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ this behavior by explicitly adding ``primary_key=True`` to a field. 
from django.db import models



class Employee(models.Model):

    employee_code = models.CharField(maxlength=10, primary_key=True)

    employee_code = models.CharField(maxlength=10, primary_key=True,

            db_column = 'code')

    first_name = models.CharField(maxlength=20)

    last_name = models.CharField(maxlength=20)

    class Meta: