diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2014-06-23 20:39:17 -0700 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2014-06-23 20:39:57 -0700 |
| commit | e4c9ccdbb5295c952a0ca12f988ae1b2164b1623 (patch) | |
| tree | 515ea1bcc3fb7f9c3a672677fc2fe703ca794c17 | |
| parent | 0dd737a719cfbd3bc11ff6f2b90161883fcebea0 (diff) | |
[1.7.x] Fixed #22889: Unneeded to_field in fk.deconstruct causing swap issues
| -rw-r--r-- | django/db/models/fields/related.py | 3 | ||||
| -rw-r--r-- | tests/field_deconstruction/tests.py | 9 |
2 files changed, 11 insertions, 1 deletions
diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index 5954cf35f4..764a577c3b 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -1652,7 +1652,8 @@ class ForeignKey(ForeignObject): 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 diff --git a/tests/field_deconstruction/tests.py b/tests/field_deconstruction/tests.py index 0e75388747..04d4c6a6ad 100644 --- a/tests/field_deconstruction/tests.py +++ b/tests/field_deconstruction/tests.py @@ -169,7 +169,10 @@ class FieldDeconstructionTests(TestCase): 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 @@ class FieldDeconstructionTests(TestCase): 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): |