Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2160 -- Modified object save logic to check for ``pk is None``…

…, rather than ``bool(pk) == False``. This allows primary keys to take a value of 0. Thanks for the report, fgutierrez@aureal.com.pe.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4459 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 795de3a67ca7208e7628dffdf6723c81f71353e0 1 parent 695302c
@freakboy3742 freakboy3742 authored
Showing with 4 additions and 5 deletions.
  1. +4 −5 django/db/models/base.py
View
9 django/db/models/base.py
@@ -167,9 +167,8 @@ def save(self):
# First, try an UPDATE. If that doesn't update anything, do an INSERT.
pk_val = self._get_pk_val()
- pk_set = bool(pk_val)
record_exists = True
- if pk_set:
+ if pk_val is not None:
# Determine whether a record with the primary key already exists.
cursor.execute("SELECT 1 FROM %s WHERE %s=%%s LIMIT 1" % \
(backend.quote_name(self._meta.db_table), backend.quote_name(self._meta.pk.column)), [pk_val])
@@ -184,11 +183,11 @@ def save(self):
db_values + [pk_val])
else:
record_exists = False
- if not pk_set or not record_exists:
+ if pk_val is None or not record_exists:
field_names = [backend.quote_name(f.column) for f in self._meta.fields if not isinstance(f, AutoField)]
db_values = [f.get_db_prep_save(f.pre_save(self, True)) for f in self._meta.fields if not isinstance(f, AutoField)]
# If the PK has been manually set, respect that.
- if pk_set:
+ if pk_val is not None:
field_names += [f.column for f in self._meta.fields if isinstance(f, AutoField)]
db_values += [f.get_db_prep_save(f.pre_save(self, True)) for f in self._meta.fields if isinstance(f, AutoField)]
placeholders = ['%s'] * len(field_names)
@@ -208,7 +207,7 @@ def save(self):
(backend.quote_name(self._meta.db_table),
backend.quote_name(self._meta.pk.column),
backend.get_pk_default_value()))
- if self._meta.has_auto_field and not pk_set:
+ if self._meta.has_auto_field and pk_val is None:
setattr(self, self._meta.pk.attname, backend.get_last_insert_id(cursor, self._meta.db_table, self._meta.pk.column))
transaction.commit_unless_managed()
Please sign in to comment.
Something went wrong with that request. Please try again.