Fix generation of Enum field

CHANGELOG.rst

@@ -8,6 +8,11 @@ Features:
 
 * Typing: Add type annotations to `fields <marshmallow_sqlalchemy.fields>`.
 
+Bug fixes:
+
+* Fix auto-generation of `marshmallow.fields.Enum` field from `sqlalchemy.Enum` columns (:issue:`615`).
+  Thanks :user:`joaquimvl` for reporting.
+
 Other changes:
 
 * Docs: Add more documentation for `marshmallow_sqlalchemy.fields.Related` (:issue:`162`).

src/marshmallow_sqlalchemy/convert.py

@@ -428,11 +428,10 @@ def _add_column_kwargs(self, kwargs: dict[str, Any], column: sa.Column) -> None:
         else:
             kwargs["dump_only"] = True
 
-        if hasattr(column.type, "enums") and not kwargs.get("dump_only"):
-            kwargs["validate"].append(validate.OneOf(choices=column.type.enums))
-
         if hasattr(column.type, "enum_class") and column.type.enum_class is not None:
             kwargs["enum"] = column.type.enum_class
+        elif hasattr(column.type, "enums") and not kwargs.get("dump_only"):
+            kwargs["validate"].append(validate.OneOf(choices=column.type.enums))
 
         # Add a length validator if a max length is set on the column
         # Skip UUID columns

tests/test_conversion.py

@@ -20,7 +20,7 @@
 )
 from marshmallow_sqlalchemy.fields import Related, RelatedList
 
-from .conftest import mapped_column
+from .conftest import CourseLevel, mapped_column
 
 
 def contains_validator(field, v_type):
@@ -71,17 +71,18 @@ def test_sets_allow_none_for_nullable_fields(self, models):
         fields_ = fields_for_model(models.Student)
         assert fields_["dob"].allow_none is True
 
-    def test_sets_enum_choices(self, models):
+    def test_enum_with_choices_converted_to_field_with_validator(self, models):
         fields_ = fields_for_model(models.Course)
         validator = contains_validator(fields_["level"], validate.OneOf)
         assert validator
         assert list(validator.choices) == ["Primary", "Secondary"]
 
-    def test_sets_enum_with_class_choices(self, models):
+    def test_enum_with_class_converted_to_enum_field(self, models):
         fields_ = fields_for_model(models.Course)
-        validator = contains_validator(fields_["level_with_enum_class"], validate.OneOf)
-        assert validator
-        assert list(validator.choices) == ["PRIMARY", "SECONDARY"]
+        field = fields_["level_with_enum_class"]
+        assert type(field) is fields.Enum
+        assert contains_validator(field, validate.OneOf) is False
+        assert field.enum is CourseLevel
 
     def test_many_to_many_relationship(self, models):
         student_fields = fields_for_model(models.Student, include_relationships=True)