diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-04 07:21:14 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2009-03-04 07:21:14 +0000 |
| commit | f9c8eeb31133d3bf55ae167168fcb2d90ce4d12a (patch) | |
| tree | 87c6e755f228f21670dc7b99c78fa6075237f3ae /django/db/models | |
| parent | dfd7a6c7811c49371838f593387ae6db7bb7ef30 (diff) | |
Fixed #10406 -- Fixed some problems with model inheritance and pk fields.
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
Diffstat (limited to 'django/db/models')
| -rw-r--r-- | django/db/models/base.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/base.py b/django/db/models/base.py index ad7c97359e..c7445672ee 100644 --- a/django/db/models/base.py +++ b/django/db/models/base.py @@ -98,8 +98,6 @@ class ModelBase(type): # 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, |