Ticket #757: pk_save.diff

django/core/meta/__init__.py

@@ -796 +796 @@
             record_exists = False
     if not pk_set or not record_exists:
         field_names = [f.column for f in opts.fields if not isinstance(f, AutoField)]
+        db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.column), True)) for f in opts.fields if not isinstance(f, AutoField)]
+
+        if pk_set:
+            field_names += [f.column for f in opts.fields if isinstance(f, AutoField)]
+            db_values += [f.get_db_prep_save(f.pre_save(getattr(self, f.column), True)) for f in opts.fields if isinstance(f, AutoField)]
+
         placeholders = ['%s'] * len(field_names)
-        db_values = [f.get_db_prep_save(f.pre_save(getattr(self, f.column), True)) for f in opts.fields if not isinstance(f, AutoField)]
+
         if opts.order_with_respect_to:
             field_names.append('_order')
             # TODO: This assumes the database supports subqueries.
@@ -806 +812 @@
             db_values.append(getattr(self, opts.order_with_respect_to.column))
         cursor.execute("INSERT INTO %s (%s) VALUES (%s)" % (opts.db_table,
             ','.join(field_names), ','.join(placeholders)), db_values)
-        if opts.has_auto_field:
+        if opts.has_auto_field and not pk_set:
             setattr(self, opts.pk.column, db.get_last_insert_id(cursor, opts.db_table, opts.pk.column))
     db.db.commit()
     # Run any post-save hooks.