Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #22889: Unneeded to_field in fk.deconstruct causing swap issues

  • Loading branch information...
commit 0b571753a89f2a7a34c76dea5ee81f821b980779 1 parent 0fba4c0
@andrewgodwin andrewgodwin authored
View
3  django/db/models/fields/related.py
@@ -1673,7 +1673,8 @@ def deconstruct(self):
if self.rel.on_delete is not CASCADE:
kwargs['on_delete'] = self.rel.on_delete
# Rel needs more work.
- if self.rel.field_name:
+ to_meta = getattr(self.rel.to, "_meta", None)
+ if self.rel.field_name and (not to_meta or (to_meta.pk and self.rel.field_name != to_meta.pk.name)):
kwargs['to_field'] = self.rel.field_name
return name, path, args, kwargs
View
9 tests/field_deconstruction/tests.py
@@ -169,7 +169,10 @@ def test_float_field(self):
def test_foreign_key(self):
# Test basic pointing
+ from django.contrib.auth.models import Permission
field = models.ForeignKey("auth.Permission")
+ field.rel.to = Permission
+ field.rel.field_name = "id"
name, path, args, kwargs = field.deconstruct()
self.assertEqual(path, "django.db.models.ForeignKey")
self.assertEqual(args, [])
@@ -194,6 +197,12 @@ def test_foreign_key(self):
self.assertEqual(path, "django.db.models.ForeignKey")
self.assertEqual(args, [])
self.assertEqual(kwargs, {"to": "auth.User", "on_delete": models.SET_NULL})
+ # Test to_field preservation
+ field = models.ForeignKey("auth.Permission", to_field="foobar")
+ name, path, args, kwargs = field.deconstruct()
+ self.assertEqual(path, "django.db.models.ForeignKey")
+ self.assertEqual(args, [])
+ self.assertEqual(kwargs, {"to": "auth.Permission", "to_field": "foobar"})
@override_settings(AUTH_USER_MODEL="auth.Permission")
def test_foreign_key_swapped(self):
Please sign in to comment.
Something went wrong with that request. Please try again.