summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2014-08-07 11:52:03 +1000
committerAndrew Godwin <andrew@aeracode.org>2014-08-07 11:52:49 +1000
commit0e69af51b1557ebe3ce93fe31498f3fa797b4b83 (patch)
treea263e2af2ad21cdf79ffbd32f5a7dec48badfffb /django
parent5e42e9f0592f987a9caba3b1322ba070927a1195 (diff)
[1.7.x] Fixed #23244: Error altering FK to non-FK in migrations
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/operations/fields.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/migrations/operations/fields.py b/django/db/migrations/operations/fields.py
index d1e98bde3f..55f27c1b6e 100644
--- a/django/db/migrations/operations/fields.py
+++ b/django/db/migrations/operations/fields.py
@@ -126,7 +126,7 @@ class AlterField(Operation):
if from_field.rel and from_field.rel.to:
if isinstance(from_field.rel.to, six.string_types):
from_field.rel.to = to_field.rel.to
- elif isinstance(to_field.rel.to, six.string_types):
+ elif to_field.rel and isinstance(to_field.rel.to, six.string_types):
to_field.rel.to = from_field.rel.to
schema_editor.alter_field(from_model, from_field, to_field)