summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorMarkus Holtermann <info@markusholtermann.eu>2014-12-11 17:52:42 +0100
committerTim Graham <timograham@gmail.com>2014-12-11 13:28:57 -0500
commitf446acf8bbd6360fdb5a9d34186c5fadf98282b7 (patch)
treee99f6e01c5e203f7ff795e044363652fbe5eb50f /django
parent491bf20d190b88ec64b9e9c6579d0bd165925677 (diff)
[1.7.x] Fixed #23956 -- Fixed migration creation for multiple table inheritance
Backport of 44927ba817a4ecf9834d429ff6c86bc5ac961305 from master
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/autodetector.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/autodetector.py b/django/db/migrations/autodetector.py
index d5286c7351..23ab3797e4 100644
--- a/django/db/migrations/autodetector.py
+++ b/django/db/migrations/autodetector.py
@@ -471,7 +471,7 @@ class MigrationAutodetector(object):
if field.rel.to:
if field.primary_key:
primary_key_rel = field.rel.to
- else:
+ elif not field.rel.parent_link:
related_fields[field.name] = field
# through will be none on M2Ms on swapped-out models;
# we can treat lack of through as auto_created=True, though.