Fixed #10251 -- Fixed model inheritance when there's also an explicit pk field.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9970 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/regressiontests/model_inheritance_regress/models.py b/tests/regressiontests/model_inheritance_regress/models.py
index b5c051d5ca..d2fa4cbf15 100644
--- a/tests/regressiontests/model_inheritance_regress/models.py
+++ b/tests/regressiontests/model_inheritance_regress/models.py
@@ -86,6 +86,19 @@ class Evaluation(Article):
 class QualityControl(Evaluation):
     assignee = models.CharField(max_length=50)
 
+class BaseM(models.Model):
+    base_name = models.CharField(max_length=100)
+
+    def __unicode__(self):
+        return self.base_name
+
+class DerivedM(BaseM):
+    customPK = models.IntegerField(primary_key=True)
+    derived_name = models.CharField(max_length=100)
+
+    def __unicode__(self):
+        return "PK = %d, base_name = %s, derived_name = %s" \
+                % (self.customPK, self.base_name, self.derived_name)
 
 __test__ = {'API_TESTS':"""
 # Regression for #7350, #7202
@@ -275,4 +288,10 @@ True
 >>> ArticleWithAuthor.objects.filter(pk=article.pk).update(headline="Oh, no!")
 1
 
+>>> DerivedM.objects.create(customPK=44, base_name="b1", derived_name="d1")
+<DerivedM: PK = 44, base_name = b1, derived_name = d1>
+>>> DerivedM.objects.all()
+[<DerivedM: PK = 44, base_name = b1, derived_name = d1>]
+
 """}
+