Changeset 4459

Timestamp:

02/03/07 18:54:30 (2 years ago)

Author:

russellm

Message:

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.

Files:

• django/trunk/django/db/models/base.py (modified) (3 diffs)

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

@@ -168 +168 @@
-        # 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
-set
+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" % \
@@ -185 +184 @@
-            else:
-                record_exists = False
-not pk_set
+pk_val is None
-            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.
-set
+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)]
@@ -209 +208 @@
-                     backend.quote_name(self._meta.pk.column),
-                     backend.get_pk_default_value()))
-not pk_set
+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()