Refs #29 -- Stopped deconstructing PolymorphicTypeField as ForeignKeys.

charettes · Jun 1, 2016 · 03fb086 · 03fb086
1 parent c1e23e9
commit 03fb086
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/polymodels/fields.py b/polymodels/fields.py
@@ -143,6 +143,7 @@ def formfield(self, **kwargs):
         return super(RelatedField, self).formfield(**defaults)
 
     def deconstruct(self):
-        name, _, args, kwargs = super(PolymorphicTypeField, self).deconstruct()
-        path = 'django.db.models.fields.related.ForeignKey'
+        name, path, args, kwargs = super(PolymorphicTypeField, self).deconstruct()
+        opts = getattr(self.polymorphic_type, '_meta', None)
+        kwargs['polymorphic_type'] = "%s.%s" % (opts.app_label, opts.object_name) if opts else self.polymorphic_type
         return name, path, args, kwargs
diff --git a/tests/test_fields.py b/tests/test_fields.py
@@ -150,6 +150,7 @@ def serialize_round_trip(self, value):
 
     def assertDeconstructionEqual(self, field, deconstructed):
         self.assertEqual(field.deconstruct(), deconstructed)
+        self.assertEqual(field.clone().deconstruct()[1:], deconstructed[1:])
         self.assertEqual(self.serialize_round_trip(deconstructed), deconstructed)
 
     def test_field_deconstruction(self):
@@ -179,28 +180,32 @@ def django_version_agnostic(deconstruction):
             return deconstruction
 
         self.assertDeconstructionEqual(Foo._meta.get_field('foo'), (
-            'foo', 'django.db.models.fields.related.ForeignKey', [], django_version_agnostic({
+            'foo', 'polymodels.fields.PolymorphicTypeField', [], django_version_agnostic({
+                'polymorphic_type': 'polymodels.Foo',
                 'to': 'contenttypes.ContentType',
                 'related_name': '+',
                 'default': ContentTypeReference('polymodels', 'foo'),
             })
         ))
         self.assertDeconstructionEqual(Bar._meta.get_field('foo'), (
-            'foo', 'django.db.models.fields.related.ForeignKey', [], django_version_agnostic({
+            'foo', 'polymodels.fields.PolymorphicTypeField', [], django_version_agnostic({
+                'polymorphic_type': 'polymodels.Foo',
                 'to': 'contenttypes.ContentType',
                 'related_name': '+',
                 'default': ContentTypeReference('polymodels', 'foo'),
             })
         ))
         self.assertDeconstructionEqual(Bar._meta.get_field('foo_null'), (
-            'foo_null', 'django.db.models.fields.related.ForeignKey', [], django_version_agnostic({
+            'foo_null', 'polymodels.fields.PolymorphicTypeField', [], django_version_agnostic({
+                'polymorphic_type': 'polymodels.Foo',
                 'to': 'contenttypes.ContentType',
                 'related_name': '+',
                 'null': True,
             })
         ))
         self.assertDeconstructionEqual(Bar._meta.get_field('foo_default'), (
-            'foo_default', 'django.db.models.fields.related.ForeignKey', [], django_version_agnostic({
+            'foo_default', 'polymodels.fields.PolymorphicTypeField', [], django_version_agnostic({
+                'polymorphic_type': 'polymodels.Foo',
                 'to': 'contenttypes.ContentType',
                 'related_name': '+',
                 'default': get_content_type(Foo).pk,