rename field

Author: timgraham

django_mongodb_backend/fields/__init__.py

@@ -2,15 +2,15 @@
 from .auto import ObjectIdAutoField
 from .duration import register_duration_field
 from .embedded_model import EmbeddedModelField
+from .embedded_model_array import EmbeddedModelArrayField
 from .json import register_json_field
-from .multiple_embedded_model import MultipleEmbeddedModelField
 from .objectid import ObjectIdField
 
 __all__ = [
     "register_fields",
     "ArrayField",
+    "EmbeddedModelArrayField",
     "EmbeddedModelField",
-    "MultipleEmbeddedModelField",
     "ObjectIdAutoField",
     "ObjectIdField",
 ]

django_mongodb_backend/fields/array.py

@@ -112,12 +112,10 @@ def db_type(self, connection):
         return "array"
 
     def get_db_prep_value(self, value, connection, prepared=False):
-        from ..fields import EmbeddedModelField
-
         if isinstance(value, list | tuple):
-            # DecimalField here is a workaround for
-            #  https://code.djangoproject.com/ticket/35982 (fixed in Django 5.2).
-            if isinstance(self.base_field, (DecimalField | EmbeddedModelField)):
+            # Workaround for https://code.djangoproject.com/ticket/35982
+            # (fixed in Django 5.2).
+            if isinstance(self.base_field, DecimalField):
                 return [self.base_field.get_db_prep_save(i, connection) for i in value]
             return [self.base_field.get_db_prep_value(i, connection, prepared=False) for i in value]
         return value

django_mongodb_backend/fields/multiple_embedded_model.py renamed to django_mongodb_backend/fields/embedded_model_array.py

@@ -1,19 +1,16 @@
-from ..forms import MultipleEmbeddedModelFormField
+from ..forms import EmbeddedModelArrayFormField
 from . import EmbeddedModelField
 from .array import ArrayField
 
 
-class MultipleEmbeddedModelField(ArrayField):
+class EmbeddedModelArrayField(ArrayField):
     def __init__(self, model, **kwargs):
         super().__init__(EmbeddedModelField(model), **kwargs)
 
     def deconstruct(self):
         name, path, args, kwargs = super().deconstruct()
-        if (
-            path
-            == "django_mongodb_backend.fields.multiple_embedded_model.MultipleEmbeddedModelField"
-        ):
-            path = "django_mongodb_backend.fields.MultipleEmbeddedModelField"
+        if path == "django_mongodb_backend.fields.multiple_embedded_model.EmbeddedModelArrayField":
+            path = "django_mongodb_backend.fields.EmbeddedModelArrayField"
         kwargs.update(
             {
                 "model": self.base_field.embedded_model,
@@ -23,10 +20,15 @@ def deconstruct(self):
         del kwargs["base_field"]
         return name, path, args, kwargs
 
+    def get_db_prep_value(self, value, connection, prepared=False):
+        if isinstance(value, list | tuple):
+            return [self.base_field.get_db_prep_save(i, connection) for i in value]
+        return value
+
     def formfield(self, **kwargs):
         return super().formfield(
             **{
-                "form_class": MultipleEmbeddedModelFormField,
+                "form_class": EmbeddedModelArrayFormField,
                 "model": self.base_field.embedded_model,
                 "max_length": self.size,
                 "prefix": self.name,

django_mongodb_backend/forms/__init__.py

@@ -1,15 +1,15 @@
 from .fields import (
+    EmbeddedModelArrayFormField,
     EmbeddedModelField,
-    MultipleEmbeddedModelFormField,
     ObjectIdField,
     SimpleArrayField,
     SplitArrayField,
     SplitArrayWidget,
 )
 
 __all__ = [
+    "EmbeddedModelArrayFormField",
     "EmbeddedModelField",
-    "MultipleEmbeddedModelFormField",
     "SimpleArrayField",
     "SplitArrayField",
     "SplitArrayWidget",

django_mongodb_backend/forms/fields/__init__.py

@@ -1,11 +1,11 @@
 from .array import SimpleArrayField, SplitArrayField, SplitArrayWidget
 from .embedded_model import EmbeddedModelField
-from .multiple_embedded_model import MultipleEmbeddedModelFormField
+from .embedded_model_array import EmbeddedModelArrayFormField
 from .objectid import ObjectIdField
 
 __all__ = [
+    "EmbeddedModelArrayFormField",
     "EmbeddedModelField",
-    "MultipleEmbeddedModelFormField",
     "SimpleArrayField",
     "SplitArrayField",
     "SplitArrayWidget",

django_mongodb_backend/forms/fields/multiple_embedded_model.py renamed to django_mongodb_backend/forms/fields/embedded_model_array.py

@@ -13,7 +13,7 @@ def models_to_dicts(models):
     return [model_to_dict(model) for model in models or []]
 
 
-class MultipleEmbeddedModelFormField(forms.Field):
+class EmbeddedModelArrayFormField(forms.Field):
     def __init__(self, model, prefix, max_length=None, *args, **kwargs):
         kwargs.pop("base_field")
         self.model = model
@@ -68,7 +68,7 @@ def __str__(self):
 
 class MultipleEmbeddedModelWidget(forms.Widget):
     """
-    This widget extracts the data for MultipleEmbeddedModelFormField's formset.
+    This widget extracts the data for EmbeddedModelArrayFormField's formset.
     It is never rendered.
     """
 

tests/model_fields_/models.py

@@ -2,7 +2,12 @@
 
 from django.db import models
 
-from django_mongodb_backend.fields import ArrayField, EmbeddedModelField, ObjectIdField
+from django_mongodb_backend.fields import (
+    ArrayField,
+    EmbeddedModelArrayField,
+    EmbeddedModelField,
+    ObjectIdField,
+)
 from django_mongodb_backend.models import EmbeddedModel
 
 
@@ -171,7 +176,7 @@ def __str__(self):
 
 class Movie(models.Model):
     title = models.CharField(max_length=255)
-    reviews = ArrayField(EmbeddedModelField(Review), null=True)
+    reviews = EmbeddedModelArrayField(Review, null=True)
 
     def __str__(self):
         return self.title

tests/model_forms_/models.py

@@ -1,6 +1,6 @@
 from django.db import models
 
-from django_mongodb_backend.fields import EmbeddedModelField, MultipleEmbeddedModelField
+from django_mongodb_backend.fields import EmbeddedModelArrayField, EmbeddedModelField
 from django_mongodb_backend.models import EmbeddedModel
 
 
@@ -38,8 +38,8 @@ def __str__(self):
 
 class Movie(models.Model):
     title = models.CharField(max_length=255)
-    reviews = MultipleEmbeddedModelField(Review)
-    featured_reviews = MultipleEmbeddedModelField(Review, null=True, blank=True)
+    reviews = EmbeddedModelArrayField(Review)
+    featured_reviews = EmbeddedModelArrayField(Review, null=True, blank=True)
 
     def __str__(self):
         return self.title