Ticket #14096: base.py.patch

base.py

@@ -444 +444 @@
         need for overrides of save() to pass around internal-only parameters
         ('raw', 'cls', and 'origin').
         """
+        newpk = False # if a new primary key is created, it is stored here for returning
         using = using or router.db_for_write(self.__class__, instance=self)
         connection = connections[using]
         assert not (force_insert and force_update)
@@ -476 +477 @@
                 if field and getattr(self, parent._meta.pk.attname) is None and getattr(self, field.attname) is not None:
                     setattr(self, parent._meta.pk.attname, getattr(self, field.attname))
 
-                self.save_base(cls=parent, origin=org, using=using)
+                newpk = self.save_base(cls=parent, origin=org, using=using)
 
+                # reset primary key of the model and its parent share
+                if self.__class__._meta.pk.attname == parent._meta.pk.attname:
+                    self._set_pk_val(None)
+
                 if field:
-                    setattr(self, field.attname, self._get_pk_val(parent._meta))
+                    setattr(self, field.attname, newpk)
             if meta.proxy:
                 return
 
@@ -531 +536 @@
                     result = manager._insert([(meta.pk, connection.ops.pk_default_value())], return_id=update_pk, raw_values=True, using=using)
 
                 if update_pk:
-                    setattr(self, meta.pk.attname, result)
+                    newpk = result
+                    if cls == self.__class__:
+                        setattr(self, meta.pk.attname, result)
             transaction.commit_unless_managed(using=using)
 
         # Store the database on which the object was saved
@@ -542 +549 @@
             signals.post_save.send(sender=origin, instance=self,
                 created=(not record_exists), raw=raw, using=using)
 
+        return newpk
+
     save_base.alters_data = True
 
     def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):