mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-26 12:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2009-03-04 07:20:08 +00:00
parent 0e93f60c7f
commit dfd7a6c781
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/regressiontests/model_inheritance_regress/models.py
View file

@ -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>]
"""}