innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[3.0.x] Refs #27914 -- Fixed serialization of nested enum.Enum classes in migrations. 

Backport of 6452112640 from master
This commit is contained in:
Hasan Ramezani 2019-10-02 15:19:22 +02:00 committed by Mariusz Felisiak
parent 1a4db2cc28
commit 30271a47da
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/migrations/serializer.py
View File

@ -121,7 +121,7 @@ class EnumSerializer(BaseSerializer):
enum_class = self.value.__class__ enum_class = self.value.__class__
module = enum_class.__module__ module = enum_class.__module__
return ( return (
'%s.%s[%r]' % (module, enum_class.__name__, self.value.name), '%s.%s[%r]' % (module, enum_class.__qualname__, self.value.name),
{'import %s' % module}, {'import %s' % module},
) )

11
tests/migrations/test_writer.py
View File

@ -184,6 +184,9 @@ class WriterTests(SimpleTestCase):
""" """
Tests the migration writer (makes migration files from Migration instances) Tests the migration writer (makes migration files from Migration instances)
""" """
class NestedEnum(enum.IntEnum):
A = 1
B = 2
def safe_exec(self, string, value=None): def safe_exec(self, string, value=None):
d = {} d = {}
@ -289,6 +292,14 @@ class WriterTests(SimpleTestCase):
IntEnum.B, IntEnum.B,
("migrations.test_writer.IntEnum['B']", {'import migrations.test_writer'}) ("migrations.test_writer.IntEnum['B']", {'import migrations.test_writer'})
) )
self.assertSerializedResultEqual(
self.NestedEnum.A,
(
"migrations.test_writer.WriterTests.NestedEnum['A']",
{'import migrations.test_writer'},
),
)
self.assertSerializedEqual(self.NestedEnum.A)
field = models.CharField(default=TextEnum.B, choices=[(m.value, m) for m in TextEnum]) field = models.CharField(default=TextEnum.B, choices=[(m.value, m) for m in TextEnum])
string = MigrationWriter.serialize(field)[0] string = MigrationWriter.serialize(field)[0]