more test updates - upgrade dependency on enum-properties

Author: bckohan

CONTRIBUTING.rst

@@ -31,7 +31,7 @@ installed:
 
 .. code-block::
 
-    poetry install
+    poetry install -E all
 
 Documentation
 -------------

django_enum/fields.py

@@ -45,7 +45,7 @@ def __init__(self, *args, enum=None, strict=strict, **kwargs):
         super().__init__(*args, **kwargs)
 
     def _try_coerce(self, value):
-        if self.enum is not None:
+        if self.enum is not None and not isinstance(value, self.enum):
             try:
                 value = self.enum(value)
             except (TypeError, ValueError):

django_enum/forms.py

@@ -18,20 +18,25 @@ def __init__(self, enum, *, empty_value='', choices=(), **kwargs):
             **kwargs
         )
 
+    def _coerce_to_value_type(self, value):
+        """Coerce the value to the enumerations value type"""
+        return type(self.enum.values[0])(value)
+
     def _coerce(self, value):
-        """
-        Validate that the value is coercible to the enumeration type.
-        """
         if value == self.empty_value or value in self.empty_values:
             return self.empty_value
-        try:
-            value = self.enum(value).value
-        except (ValueError, TypeError, ValidationError) as err:
-            raise ValidationError(
-                f'{value} is not a valid {self.enum}.',
-                code='invalid_choice',
-                params={'value': value},
-            ) from err
+        if self.enum is not None and not isinstance(value, self.enum):
+            try:
+                value = self.enum(value)
+            except (TypeError, ValueError):
+                try:
+                    value = self.enum(self._coerce_to_value_type(value))
+                except (TypeError, ValueError) as err:
+                    raise ValidationError(
+                        f'{value} is not a valid {self.enum}.',
+                        code='invalid_choice',
+                        params={'value': value},
+                    ) from err
         return value
 
     def clean(self, value):

django_enum/tests/app1/forms.py

@@ -0,0 +1,33 @@
+from django.forms import ModelForm
+from django_enum import EnumChoiceField
+from django_enum.tests.app1.enums import (
+    SmallPosIntEnum,
+    SmallIntEnum,
+    PosIntEnum,
+    IntEnum,
+    BigIntEnum,
+    BigPosIntEnum,
+    Constants,
+    TextEnum,
+    DJIntEnum,
+    DJTextEnum
+)
+from django_enum.tests.app1.models import EnumTester
+
+
+class EnumTesterForm(ModelForm):
+    small_pos_int = EnumChoiceField(SmallPosIntEnum)
+    small_int = EnumChoiceField(SmallIntEnum)
+    pos_int = EnumChoiceField(PosIntEnum)
+    int = EnumChoiceField(IntEnum)
+    big_pos_int = EnumChoiceField(BigPosIntEnum)
+    big_int = EnumChoiceField(BigIntEnum)
+    constant = EnumChoiceField(Constants)
+    text = EnumChoiceField(TextEnum)
+    dj_int_enum = EnumChoiceField(DJIntEnum)
+    dj_text_enum = EnumChoiceField(DJTextEnum)
+    non_strict_int = EnumChoiceField(SmallPosIntEnum)
+
+    class Meta:
+        model = EnumTester
+        fields = '__all__'

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

@@ -1,7 +1,7 @@
-# Generated by Django 3.2.14 on 2022-07-22 14:29
+# Generated by Django 3.2.14 on 2022-07-23 12:19
 
-import django_enum.fields
 from django.db import migrations, models
+import django_enum.fields
 
 
 class Migration(migrations.Migration):
@@ -31,6 +31,7 @@ class Migration(migrations.Migration):
                 ('char_field', models.CharField(blank=True, default='A', max_length=1)),
                 ('dj_int_enum', django_enum.fields.EnumPositiveSmallIntegerField(choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=1)),
                 ('dj_text_enum', django_enum.fields.EnumCharField(choices=[('A', 'Label A'), ('B', 'Label B'), ('C', 'Label C')], default='A', max_length=1)),
+                ('non_strict_int', django_enum.fields.EnumPositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=None, null=True)),
             ],
             options={
                 'ordering': ('id',),
@@ -45,4 +46,43 @@ class Migration(migrations.Migration):
                 ('color', django_enum.fields.EnumCharField(choices=[('R', 'Red'), ('G', 'Green'), ('B', 'Blue')], max_length=1)),
             ],
         ),
+        migrations.CreateModel(
+            name='PerfCompare',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('small_pos_int', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=None, null=True)),
+                ('small_int', models.SmallIntegerField(blank=True, choices=[(-32768, 'Value -32768'), (0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=32767)),
+                ('pos_int', models.PositiveIntegerField(blank=True, choices=[(0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483647, 'Value 2147483647')], db_index=True, default=2147483647)),
+                ('int', models.IntegerField(blank=True, choices=[(-2147483648, 'Value -2147483648'), (0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483647, 'Value 2147483647')], db_index=True, null=True)),
+                ('big_pos_int', models.PositiveBigIntegerField(blank=True, choices=[(0, 'Value 0'), (1, 'Value 1'), (2, 'Value 2'), (2147483648, 'Value 2147483647')], db_index=True, default=None, null=True)),
+                ('big_int', models.BigIntegerField(blank=True, choices=[(-2147483649, 'Value -2147483649'), (1, 'Value 1'), (2, 'Value 2'), (2147483648, 'Value 2147483647')], db_index=True, default=-2147483649)),
+                ('constant', models.FloatField(blank=True, choices=[(3.141592653589793, 'Pi'), (2.71828, "Euler's Number"), (1.618033988749895, 'Golden Ratio')], db_index=True, default=None, null=True)),
+                ('text', models.CharField(blank=True, choices=[('V1', 'Value1'), ('V22', 'Value2'), ('V333', 'Value3'), ('D', 'Default')], db_index=True, default=None, max_length=4, null=True)),
+                ('int_choice', models.IntegerField(blank=True, choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=1)),
+                ('char_choice', models.CharField(blank=True, choices=[('A', 'First'), ('B', 'Second'), ('C', 'Third')], default='A', max_length=1)),
+                ('int_field', models.IntegerField(blank=True, default=1)),
+                ('float_field', models.FloatField(blank=True, default=1.5)),
+                ('char_field', models.CharField(blank=True, default='A', max_length=1)),
+                ('dj_int_enum', models.PositiveSmallIntegerField(choices=[(1, 'One'), (2, 'Two'), (3, 'Three')], default=1)),
+                ('dj_text_enum', models.CharField(choices=[('A', 'Label A'), ('B', 'Label B'), ('C', 'Label C')], default='A', max_length=1)),
+                ('non_strict_int', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], default=None, null=True)),
+            ],
+            options={
+                'ordering': ('id',),
+            },
+        ),
+        migrations.CreateModel(
+            name='SingleEnumPerf',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('small_pos_int', django_enum.fields.EnumPositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=None, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='SingleFieldPerf',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('small_pos_int', models.PositiveSmallIntegerField(blank=True, choices=[(0, 'Value 1'), (2, 'Value 2'), (32767, 'Value 32767')], db_index=True, default=None, null=True)),
+            ],
+        ),
     ]

django_enum/tests/app1/models.py

@@ -72,6 +72,15 @@ class EnumTester(models.Model):
     dj_int_enum = EnumField(DJIntEnum, default=DJIntEnum.ONE.value)
     dj_text_enum = EnumField(DJTextEnum, default=DJTextEnum.A.value)
 
+    # Non-strict
+    non_strict_int = EnumField(
+        SmallPosIntEnum,
+        strict=False,
+        null=True,
+        default=None,
+        blank=True
+    )
+
     def get_absolute_url(self):
         return reverse('django_enum_tests_app1:enum-detail', kwargs={'pk': self.pk})
 
@@ -103,3 +112,73 @@ class Color(TextChoices, s('rgb'), s('hex', case_fold=True)):
     int_enum = EnumField(IntEnum)
     color = EnumField(Color)
 
+
+class PerfCompare(models.Model):
+
+    small_pos_int = models.PositiveSmallIntegerField(choices=SmallPosIntEnum.choices, null=True, default=None, db_index=True, blank=True)
+    small_int = models.SmallIntegerField(choices=SmallIntEnum.choices, null=False, default=SmallIntEnum.VAL3, db_index=True, blank=True)
+
+    pos_int = models.PositiveIntegerField(choices=PosIntEnum.choices, default=PosIntEnum.VAL3, db_index=True, blank=True)
+    int = models.IntegerField(choices=IntEnum.choices, null=True, db_index=True, blank=True)
+
+    big_pos_int = models.PositiveBigIntegerField(choices=BigPosIntEnum.choices, null=True, default=None, db_index=True, blank=True)
+    big_int = models.BigIntegerField(choices=BigIntEnum.choices, default=BigIntEnum.VAL0, db_index=True, blank=True)
+
+    constant = models.FloatField(choices=Constants.choices, null=True, default=None, db_index=True, blank=True)
+
+    text = models.CharField(choices=TextEnum.choices, max_length=4, null=True, default=None, db_index=True, blank=True)
+
+    # basic choice fields - used to compare behavior
+    int_choice = models.IntegerField(
+        default=1,
+        null=False,
+        blank=True,
+        choices=((1, 'One'), (2, 'Two'), (3, 'Three'))
+    )
+
+    char_choice = models.CharField(
+        max_length=1,
+        default='A',
+        null=False,
+        blank=True,
+        choices=(('A', 'First'), ('B', 'Second'), ('C', 'Third'))
+    )
+
+    int_field = models.IntegerField(
+        default=1,
+        null=False,
+        blank=True
+    )
+
+    float_field = models.FloatField(
+        default=1.5,
+        null=False,
+        blank=True
+    )
+
+    char_field = models.CharField(
+        max_length=1,
+        default='A',
+        null=False,
+        blank=True
+    )
+    ################################################
+
+    dj_int_enum = models.PositiveSmallIntegerField(choices=DJIntEnum.choices, default=DJIntEnum.ONE.value)
+    dj_text_enum = models.CharField(choices=DJTextEnum.choices, default=DJTextEnum.A.value, max_length=1)
+
+    # Non-strict
+    non_strict_int = models.PositiveSmallIntegerField(choices=SmallPosIntEnum.choices, null=True, default=None, blank=True)
+
+    class Meta:
+        ordering = ('id',)
+
+
+class SingleEnumPerf(models.Model):
+
+    small_pos_int = EnumField(enum=SmallPosIntEnum, null=True, default=None, db_index=True, blank=True)
+
+
+class SingleFieldPerf(models.Model):
+
+    small_pos_int = models.PositiveSmallIntegerField(choices=SmallPosIntEnum.choices, null=True, default=None, db_index=True, blank=True)

django_enum/tests/app1/templates/django_enum_tests_app1/enumtester_detail.html

@@ -13,6 +13,7 @@ <h1>{{ object.pk }}</h1>
     <p class="text">text: <b><span class="value">{{ object.text.value }}</span></b> <b><span class="label">{{ object.text.label }}</span></b></p>
     <p class="dj_int_enum">dj_int_enum: <b><span class="value">{{ object.dj_int_enum.value }}</span></b> <b><span class="label">{{ object.dj_int_enum.label }}</span></b></p>
     <p class="dj_text_enum">dj_text_enum: <b><span class="value">{{ object.dj_text_enum.value }}</span></b> <b><span class="label">{{ object.dj_text_enum.label }}</span></b></p>
+    <p class="non_strict_int">non_strict_int: <b><span class="value">{{ object.non_strict_int.value}}</span></b> <b><span class="label">{{ object.non_strict_int.label }}</span></b></p>
 
     <p>
     <a href="{% url 'django_enum_tests_app1:enum-update' pk=object.pk %}">Edit</a>

django_enum/tests/app1/templates/django_enum_tests_app1/enumtester_list.html

@@ -15,6 +15,7 @@ <h2>{{ object.pk }}</h2>
         <p class="text">text: <b><span class="value">{{ object.text.value }}</span></b> <b><span class="label">{{ object.text.label }}</span></b></p>
         <p class="dj_int_enum">dj_int_enum: <b><span class="value">{{ object.dj_int_enum.value }}</span></b> <b><span class="label">{{ object.dj_int_enum.label }}</span></b></p>
         <p class="dj_text_enum">dj_text_enum: <b><span class="value">{{ object.dj_text_enum.value }}</span></b> <b><span class="label">{{ object.dj_text_enum.label }}</span></b></p>
+        <p class="non_strict_int">non_strict_int: <b><span class="value">{{ object.non_strict_int.value}}</span></b> <b><span class="label">{{ object.non_strict_int.label }}</span></b></p>
 
         <p>
         <a href="{% url 'django_enum_tests_app1:enum-update' pk=object.pk %}">Edit</a>

django_enum/tests/app1/urls.py

@@ -8,6 +8,7 @@
     EnumTesterFormView,
     EnumTesterListView,
     EnumTesterUpdateView,
+    EnumTesterFormCreateView
 )
 from django_filters.views import FilterView
 
@@ -31,6 +32,7 @@
         name='enum-filter_explicit'
     ),
     path('enum/add/', EnumTesterCreateView.as_view(), name='enum-add'),
+    path('enum/form/add/', EnumTesterFormCreateView.as_view(), name='enum-form-add'),
     path('enum/<int:pk>/', EnumTesterUpdateView.as_view(), name='enum-update'),
     path('enum/form/<int:pk>/', EnumTesterFormView.as_view(), name='enum-form-update'),
     path('enum/<int:pk>/delete/', EnumTesterDeleteView.as_view(), name='enum-delete'),

django_enum/tests/app1/views.py

@@ -16,6 +16,7 @@
     SmallPosIntEnum,
     TextEnum,
 )
+from django_enum.tests.app1.forms import EnumTesterForm
 from django_enum.tests.app1.models import EnumTester
 from django_filters.views import FilterView
 
@@ -40,21 +41,11 @@ class EnumTesterUpdateView(UpdateView):
 
 class EnumTesterFormView(UpdateView):
 
-    class EnumTesterForm(ModelForm):
-        small_pos_int = EnumChoiceField(SmallPosIntEnum)
-        small_int = EnumChoiceField(SmallIntEnum)
-        pos_int = EnumChoiceField(PosIntEnum)
-        int = EnumChoiceField(IntEnum)
-        big_pos_int = EnumChoiceField(BigPosIntEnum)
-        big_int = EnumChoiceField(BigIntEnum)
-        constant = EnumChoiceField(Constants)
-        text = EnumChoiceField(TextEnum)
-        dj_int_enum = EnumChoiceField(DJIntEnum)
-        dj_text_enum = EnumChoiceField(DJTextEnum)
+    form_class = EnumTesterForm
+    model = EnumTester
 
-        class Meta:
-            model = EnumTester
-            fields = '__all__'
+
+class EnumTesterFormCreateView(CreateView):
 
     form_class = EnumTesterForm
     model = EnumTester