fix #109

Author: bckohan

.github/workflows/test.yml

@@ -27,6 +27,7 @@ jobs:
       actions: write
     # Service containers to run with `container-job`  
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.9', '3.10', '3.11', '3.12', '3.13']
         postgres-version: ['9.6', '12', 'latest']
@@ -158,6 +159,7 @@ jobs:
       TEST_DJANGO_VERSION: ${{ matrix.django-version }}
       TEST_DATABASE_VERSION: "sqlite"
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.13']
         django-version:
@@ -214,6 +216,7 @@ jobs:
       contents: read
       actions: write
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.13']
         mysql-version: ['5.7', 'latest']
@@ -321,6 +324,7 @@ jobs:
       TEST_DATABASE_VERSION: ${{ matrix.mariadb-version }}
 
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.13']
         mysqlclient-version: ['1.4.3', '']
@@ -427,6 +431,7 @@ jobs:
       IGNORE_ORA_01843: True
       IGNORE_ORA_00932: True
     strategy:
+      fail-fast: false
       matrix:
         python-version: ['3.9', '3.10', '3.12']
         django-version:
@@ -530,6 +535,7 @@ jobs:
       TEST_DJANGO_VERSION: ${{ matrix.django-version }}
       TEST_DATABASE_VERSION: "sqlite"
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.13']
         django-version:
@@ -590,6 +596,7 @@ jobs:
       TEST_DJANGO_VERSION: ${{ matrix.django-version }}
       TEST_DATABASE_VERSION: "sqlite"
     strategy:
+      fail-fast: false
       matrix:
         python-version: [ '3.9', '3.13']
         django-version:

doc/source/changelog.rst

@@ -7,6 +7,7 @@ Change Log
 v2.2.0 (2025-03-XX)
 ===================
 
+* Fixed `Enum types that resolve to primitives of str or int but that do not inherit from those types can result in validation errors. <https://github.com/bckohan/django-enum/issues/109>`_
 * Implemented `If default is not provided for flag fields it should be Flag(0). <https://github.com/bckohan/django-enum/issues/105>`_
 * Fixed `EnumFlagFields set empty values to Flag(0) when model field has null=True, default=None <https://github.com/bckohan/django-enum/issues/104>`_
 * Fixed `Large enum fields that inherit from binaryfield have editable=False by default <https://github.com/bckohan/django-enum/issues/103>`_

justfile

@@ -1,6 +1,9 @@
 set windows-shell := ["powershell.exe", "-NoLogo", "-Command"]
 set unstable := true
-set script-interpreter := ['uv', 'run', '--script']
+
+#set script-interpreter := ['uv', 'run', '--script']
+
+set script-interpreter := ['python']
 
 export PYTHONPATH := source_directory()
 

src/django_enum/fields.py

@@ -12,7 +12,13 @@
 
 from django import VERSION as django_version
 from django.core.exceptions import ValidationError
-from django.core.validators import DecimalValidator
+from django.core.validators import (
+    DecimalValidator,
+    MaxLengthValidator,
+    MaxValueValidator,
+    MinLengthValidator,
+    MinValueValidator,
+)
 from django.db.models import (
     NOT_PROVIDED,
     BigIntegerField,
@@ -89,12 +95,17 @@ class EnumValidatorAdapter:
     """
 
     wrapped: Type
+    allow_null: bool
 
-    def __init__(self, wrapped):
+    def __init__(self, wrapped, allow_null):
         self.wrapped = wrapped
+        self.allow_null = allow_null
 
     def __call__(self, value):
-        return self.wrapped(value.value if isinstance(value, Enum) else value)
+        value = value.value if isinstance(value, Enum) else value
+        if value is None and self.allow_null:
+            return
+        return self.wrapped(value)
 
     def __eq__(self, other):
         return self.wrapped == other
@@ -792,6 +803,14 @@ def __init__(
                 ),
             )
         super().__init__(enum=enum, primitive=primitive, **kwargs)
+        self.validators = [
+            (
+                EnumValidatorAdapter(validator, self.null)  # type: ignore
+                if isinstance(validator, (MinLengthValidator, MaxLengthValidator))
+                else validator
+            )
+            for validator in self.validators
+        ]
 
 
 class EnumFloatField(EnumField[Type[float]], FloatField):
@@ -850,6 +869,8 @@ class IntEnumField(EnumField[Type[int]]):
     supporting enumerations with integer values.
     """
 
+    validators: List[Any]
+
     @property
     def bit_length(self):
         """
@@ -875,6 +896,14 @@ def __init__(
     ):
         self._bit_length_ = bit_length
         super().__init__(enum=enum, primitive=primitive, **kwargs)
+        self.validators = [
+            (
+                EnumValidatorAdapter(validator, self.null)  # type: ignore
+                if isinstance(validator, (MinValueValidator, MaxValueValidator))
+                else validator
+            )
+            for validator in self.validators
+        ]
 
 
 class EnumSmallIntegerField(IntEnumField, SmallIntegerField):
@@ -1082,6 +1111,14 @@ def __init__(
                 ),
             },
         )
+        self.validators = [
+            (
+                EnumValidatorAdapter(validator, self.null)  # type: ignore
+                if isinstance(validator, DecimalValidator)
+                else validator
+            )
+            for validator in self.validators
+        ]
 
     def to_python(self, value: Any) -> Union[Enum, Any]:
         if not self.enum:
@@ -1090,17 +1127,6 @@ def to_python(self, value: Any) -> Union[Enum, Any]:
             value = DecimalField.to_python(self, value)
         return EnumField.to_python(self, value)
 
-    @cached_property
-    def validators(self):
-        return [
-            (
-                EnumValidatorAdapter(validator)  # type: ignore
-                if isinstance(validator, DecimalValidator)
-                else validator
-            )
-            for validator in super().validators
-        ]
-
     def value_to_string(self, obj):
         val = self.value_from_object(obj)
         val = val.value if isinstance(val, Enum) else val

tests/djenum/admin.py

@@ -7,12 +7,14 @@
     NullBlankFormTester,
     NullableBlankFormTester,
     Bug53Tester,
+    NullableStrFormTester,
 )
 
 admin.site.register(EnumTester)
 admin.site.register(NullBlankFormTester)
 admin.site.register(NullableBlankFormTester)
 admin.site.register(Bug53Tester)
+admin.site.register(NullableStrFormTester)
 
 
 class AdminDisplayBug35Admin(admin.ModelAdmin):

tests/djenum/enums.py

@@ -62,6 +62,15 @@ def __str__(self):
         return self.name
 
 
+class NullableStrEnum(Enum):
+    NONE = None
+    STR1 = "str1"
+    STR2 = "str2"
+
+    def __str__(self):
+        return self.name
+
+
 class Constants(FloatChoices):
     PI = 3.14159265358979323846264338327950288, "Pi"
     e = 2.71828, "Euler's Number"

tests/djenum/models.py

@@ -26,6 +26,7 @@
     MultiWithNone,
     NegativeFlagEnum,
     NullableExternEnum,
+    NullableStrEnum,
     PathEnum,
     PosIntEnum,
     PositiveFlagEnum,
@@ -358,6 +359,20 @@ class NullableBlankFormTester(models.Model):
     )
 
 
+class NullableStrFormTester(models.Model):
+    required = EnumField(NullableStrEnum)
+    required_default = EnumField(NullableStrEnum, default=NullableStrEnum.STR2)
+    # this is allowed but will result in validation errors on form submission with null selected
+    blank = EnumField(NullableStrEnum, null=False, blank=True)
+    # this is allowed but you will not be able to submit nulls via a form
+    # this is beyond the scope of django-enum - implement custom form logic to do this
+    # nullable = EnumField(ExternEnum, null=True)
+    blank_nullable = EnumField(NullableStrEnum, null=True, blank=True)
+    blank_nullable_default = EnumField(
+        NullableStrEnum, null=True, blank=True, default=NullableStrEnum.NONE
+    )
+
+
 class Bug53Tester(models.Model):
     char_blank_null_true = EnumField(StrTestEnum, null=True, blank=True)
     char_blank_null_false = EnumField(StrTestEnum, null=False, blank=True)

tests/test_admin.py

@@ -11,8 +11,14 @@
     NullBlankFormTester,
     NullableBlankFormTester,
     Bug53Tester,
+    NullableStrFormTester,
+)
+from tests.djenum.enums import (
+    ExternEnum,
+    NullableExternEnum,
+    StrTestEnum,
+    NullableStrEnum,
 )
-from tests.djenum.enums import ExternEnum, NullableExternEnum, StrTestEnum
 from playwright.sync_api import sync_playwright, Page, expect
 from django.urls import reverse
 from django.contrib.auth import get_user_model
@@ -77,6 +83,9 @@ class _GenericAdminFormTest(StaticLiveServerTestCase):
 
     __test__ = False
 
+    def enum(self, field):
+        return self.MODEL_CLASS._meta.get_field(field).enum
+
     @property
     def changes(self) -> t.List[t.Dict[str, Enum]]:
         # must implement
@@ -148,18 +157,23 @@ def setUp(self):
     def set_form_value(
         self, field_name: str, value: t.Optional[t.Union[Enum, str]], flag=False
     ):
-        # should override this if needed
-        if value is None and not flag:
-            self.page.select_option(f"select[name='{field_name}']", "")
-        elif flag:
-            self.page.select_option(
-                f"select[name='{field_name}']",
-                [str(flag.value) for flag in decompose(value)],
-            )
-        else:
-            self.page.select_option(
-                f"select[name='{field_name}']", str(getattr(value, "value", value))
-            )
+        try:
+            if value is None and None in self.enum(field_name):
+                value = self.enum(field_name)(value)
+            # should override this if needed
+            if getattr(value, "value", value) is None and not flag:
+                self.page.select_option(f"select[name='{field_name}']", "")
+            elif flag:
+                self.page.select_option(
+                    f"select[name='{field_name}']",
+                    [str(flag.value) for flag in decompose(value)],
+                )
+            else:
+                self.page.select_option(
+                    f"select[name='{field_name}']", str(getattr(value, "value", value))
+                )
+        except Exception:
+            self.page.pause()
 
     def verify_changes(self, obj: Model, expected: t.Dict[str, t.Any]):
         count = 0
@@ -324,6 +338,7 @@ def changes(self) -> t.Dict[str, Enum]:
 class TestNullableBlankAdminBehavior(_GenericAdminFormTest):
     MODEL_CLASS = NullableBlankFormTester
     __test__ = True
+    HEADLESS = True
 
     @property
     def changes(self) -> t.Dict[str, Enum]:
@@ -353,6 +368,39 @@ def changes(self) -> t.Dict[str, Enum]:
         ]
 
 
+class TestNullableStrAdminBehavior(_GenericAdminFormTest):
+    MODEL_CLASS = NullableStrFormTester
+    __test__ = True
+    HEADLESS = True
+
+    @property
+    def changes(self) -> t.Dict[str, Enum]:
+        return [
+            {"required": NullableStrEnum.STR1, "blank": NullableStrEnum.STR2},
+            {
+                "required": NullableStrEnum.STR2,
+                "required_default": NullableStrEnum.STR1,
+                "blank": NullableStrEnum.STR2,
+                "blank_nullable": None,
+                "blank_nullable_default": None,
+            },
+            {
+                "required": NullableStrEnum.STR1,
+                "required_default": NullableStrEnum.STR2,
+                "blank": NullableStrEnum.STR2,
+                "blank_nullable": NullableStrEnum.STR1,
+                "blank_nullable_default": NullableStrEnum.NONE,
+            },
+            {
+                "required": NullableStrEnum.STR2,
+                "required_default": NullableStrEnum.STR2,
+                "blank": None,
+                "blank_nullable": "",
+                "blank_nullable_default": "",
+            },
+        ]
+
+
 class TestBug53AdminBehavior(_GenericAdminFormTest):
     MODEL_CLASS = Bug53Tester
     __test__ = True