bring in changes from 1.3.1

Author: bckohan

django_enum/fields.py

@@ -519,6 +519,14 @@ def deconstruct(self) -> Tuple[str, str, List, dict]:
         if self.enum is not None:
             kwargs["choices"] = choices(self.enum)
 
+        if "db_default" in kwargs:
+            try:
+                kwargs["db_default"] = getattr(
+                    self.to_python(kwargs["db_default"]), "value", kwargs["db_default"]
+                )
+            except ValidationError:
+                pass
+
         if "default" in kwargs:
             # ensure default in deconstructed fields is always the primitive
             # value type

django_enum/tests/db_default/migrations/0001_initial.py

@@ -1,9 +1,9 @@
-# Generated by Django 5.0.2 on 2024-03-02 16:48
+# Generated by Django 5.0.2 on 2024-03-03 01:51
 
+import django.db.models.functions.text
 from django.db import migrations, models
 
 import django_enum.fields
-import django_enum.tests.djenum.enums
 
 
 class Migration(migrations.Migration):
@@ -144,7 +144,9 @@ class Migration(migrations.Migration):
                             ("V333", "Value3"),
                             ("D", "Default"),
                         ],
-                        db_default="db_default",
+                        db_default=django.db.models.functions.text.Concat(
+                            models.Value("db"), models.Value("_default")
+                        ),
                         default="",
                         max_length=10,
                     ),
@@ -184,7 +186,7 @@ class Migration(migrations.Migration):
                     django_enum.fields.EnumPositiveSmallIntegerField(
                         blank=True,
                         choices=[(1, "ONE"), (2, "TWO"), (3, "THREE")],
-                        db_default=django_enum.tests.djenum.enums.ExternEnum["THREE"],
+                        db_default=3,
                         null=True,
                     ),
                 ),

django_enum/tests/db_default/models.py

@@ -1,4 +1,6 @@
 from django.db import models
+from django.db.models.expressions import Value
+from django.db.models.functions import Concat
 from django.urls import reverse
 
 from django_enum import EnumField
@@ -38,7 +40,7 @@ class DBDefaultTester(models.Model):
     doubled_text = EnumField(
         TextEnum,
         default="",
-        db_default="db_default",
+        db_default=Concat(Value('db'), Value('_default')),
         blank=True,
         max_length=10,
         strict=False,

doc/source/changelog.rst

@@ -16,6 +16,10 @@ v2.0.0
 * Fixed `When coerce is false, to_python does not convert to the Enum's primitive type <https://github.com/bckohan/django-enum/issues/39>`_
 * Fixed `None should be an allowable enumeration value in enums of any primitive type. <https://github.com/bckohan/django-enum/issues/42>`_
 
+v1.3.1
+======
+
+* Fixed `db_default produces expressions instead of primitives when given enum value instances. <https://github.com/bckohan/django-enum/issues/59>`_
 
 v1.3.0
 ======