From dfd7a6c7811c49371838f593387ae6db7bb7ef30 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Wed, 4 Mar 2009 07:20:08 +0000 Subject: 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 --- .../model_inheritance_regress/models.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'tests') 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.objects.all() +[] + """} + -- cgit v1.3