mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-04 07:46:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #27742 -- Reverted "Fixed #24607 -- Serialized natural keys in multi-table inheritance models."

Browse source 
This reverts commit 74a575eb72 as it causes
unexpected migrations and doesn't seem to be the best solution.
This commit is contained in:
Tim Graham 2017-02-11 06:31:20 -05:00
parent 7b6e42089c
commit 0595bca221
5 changed files with 3 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

7
django/db/models/options.py
View file

@ -11,7 +11,6 @@ from django.db import connections
from django.db.models import Manager
from django.db.models.fields import AutoField
from django.db.models.fields.proxy import OrderWrt
from django.db.models.fields.related import OneToOneField
from django.db.models.query_utils import PathInfo
from django.utils.datastructures import ImmutableList, OrderedSet
from django.utils.deprecation import RemovedInDjango21Warning
@ -281,11 +280,7 @@ class Options:
def setup_pk(self, field):
if not self.pk and field.primary_key:
self.pk = field
# If the field is a OneToOneField and it's been marked as PK, then
# this is a multi-table inheritance PK. It needs to be serialized
# to relate the subclass instance to the superclass instance.
if not isinstance(field, OneToOneField):
field.serialize = False
field.serialize = False
def setup_proxy(self, target):
"""