Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed #10406 -- Fixed some problems with model inheritance and pk fie…
…lds.

Manually specifying both a OneToOneField(parent_link=True) and separate a
primary key field was causing invalid SQL to be generated. Thanks to Ramiro
Morales for some analysis on this one.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
malcolmt committed Mar 4, 2009
1 parent dfd7a6c commit f9c8eeb
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 2 deletions.
2 changes: 0 additions & 2 deletions django/db/models/base.py
Expand Up @@ -98,8 +98,6 @@ def __new__(cls, name, bases, attrs):
# Concrete classes...
if base in o2o_map:
field = o2o_map[base]
field.primary_key = True
new_class._meta.setup_pk(field)
else:
attr_name = '%s_ptr' % base._meta.module_name
field = OneToOneField(base, name=attr_name,
Expand Down
25 changes: 25 additions & 0 deletions tests/regressiontests/model_inheritance_regress/models.py
Expand Up @@ -43,6 +43,16 @@ class ParkingLot(Place):
def __unicode__(self):
return u"%s the parking lot" % self.name

class ParkingLot2(Place):
# In lieu of any other connector, an existing OneToOneField will be
# promoted to the primary key.
parent = models.OneToOneField(Place)

class ParkingLot3(Place):
# The parent_link connector need not be the pk on the model.
primary_key = models.AutoField(primary_key=True)
parent = models.OneToOneField(Place, parent_link=True)

class Supplier(models.Model):
restaurant = models.ForeignKey(Restaurant)

Expand Down Expand Up @@ -293,5 +303,20 @@ def __unicode__(self):
>>> DerivedM.objects.all()
[<DerivedM: PK = 44, base_name = b1, derived_name = d1>]
# Regression tests for #10406
# If there's a one-to-one link between a child model and the parent and no
# explicit pk declared, we can use the one-to-one link as the pk on the child.
# The ParkingLot2 model shows this behaviour.
>>> ParkingLot2._meta.pk.name
"parent"
# However, the connector from child to parent need not be the pk on the child
# at all.
>>> ParkingLot3._meta.pk.name
"primary_key"
>>> ParkingLot3._meta.get_ancestor_link(Place).name # the child->parent link
"parent"
"""}

0 comments on commit f9c8eeb

Please sign in to comment.