unfold embedded field into its parent model.

Author: WaVEV

django_mongodb_backend/fields/embedded_model.py

@@ -155,6 +155,20 @@ def formfield(self, **kwargs):
             }
         )
 
+    def contribute_to_class(self, cls, name):
+        super().contribute_to_class(cls, name)
+        new_fields = [
+            *self.embedded_model._meta.local_fields,
+            *self.embedded_model._meta.private_fields,
+        ]
+        for field in new_fields:
+            embedded_field_name = f"{name}.{field.name}"
+            field = field.clone()
+            field.unique = False
+            field.db_index = False
+            field.name = embedded_field_name
+            models.Field.contribute_to_class(field, cls, embedded_field_name, private_only=False)
+
 
 class KeyTransform(Transform):
     def __init__(self, key_name, ref_field, *args, **kwargs):

django_mongodb_backend/indexes.py

@@ -3,7 +3,6 @@
 
 from django.core.checks import Error, Warning
 from django.db import NotSupportedError
-from django.db.backends.utils import names_digest, split_identifier
 from django.db.models import FloatField, Index, IntegerField
 from django.db.models.lookups import BuiltinLookup
 from django.db.models.sql.query import Query
@@ -14,7 +13,6 @@
 from django_mongodb_backend.fields import ArrayField
 
 from .query_utils import process_rhs
-from .utils import get_field
 
 MONGO_INDEX_OPERATORS = {
     "exact": "$eq",
@@ -63,7 +61,7 @@ def get_pymongo_index_model(self, model, schema_editor, field=None, unique=False
             filter_expression[column].update({"$type": field.db_type(schema_editor.connection)})
         else:
             for field_name, _ in self.fields_orders:
-                field_ = get_field(model, field_name)
+                field_ = model._meta.get_field(field_name)
                 filter_expression[field_.column].update(
                     {"$type": field_.db_type(schema_editor.connection)}
                 )
@@ -76,7 +74,7 @@ def get_pymongo_index_model(self, model, schema_editor, field=None, unique=False
             # order is "" if ASCENDING or "DESC" if DESCENDING (see
             # django.db.models.indexes.Index.fields_orders).
             (
-                column_prefix + get_field(model, field_name).column,
+                column_prefix + model._meta.get_field(field_name).column,
                 ASCENDING if order == "" else DESCENDING,
             )
             for field_name, order in self.fields_orders
@@ -156,7 +154,7 @@ def get_pymongo_index_model(
         for field_name, _ in self.fields_orders:
             field = model._meta.get_field(field_name)
             type_ = self.search_index_data_types(field.db_type(schema_editor.connection))
-            field_path = column_prefix + get_field(model, field_name).column
+            field_path = column_prefix + model._meta.get_field(field_name).column
             fields[field_path] = {"type": type_}
         return SearchIndexModel(
             definition={"mappings": {"dynamic": False, "fields": fields}}, name=self.name
@@ -266,7 +264,7 @@ def get_pymongo_index_model(
         fields = []
         for field_name, _ in self.fields_orders:
             field_ = model._meta.get_field(field_name)
-            field_path = column_prefix + get_field(model, field_name).column
+            field_path = column_prefix + model._meta.get_field(field_name).column
             mappings = {"path": field_path}
             if isinstance(field_, ArrayField):
                 mappings.update(
@@ -282,38 +280,8 @@ def get_pymongo_index_model(
         return SearchIndexModel(definition={"fields": fields}, name=self.name, type="vectorSearch")
 
 
-def set_name_with_model(self, model):
-    """
-    Generate a unique name for the index.
-
-    The name is divided into 3 parts - table name (12 chars), field name
-    (8 chars) and unique hash + suffix (10 chars). Each part is made to
-    fit its size by truncating the excess length.
-    """
-    _, table_name = split_identifier(model._meta.db_table)
-    column_names = [get_field(model, field_name).column for field_name, order in self.fields_orders]
-    column_names_with_order = [
-        (f"-{column_name}" if order else column_name)
-        for column_name, (field_name, order) in zip(column_names, self.fields_orders, strict=False)
-    ]
-    # The length of the parts of the name is based on the default max
-    # length of 30 characters.
-    hash_data = [table_name, *column_names_with_order, self.suffix]
-    self.name = (
-        f"{table_name[:11]}_{column_names[0][:7]}_"
-        f"{names_digest(*hash_data, length=6)}_{self.suffix}"
-    )
-    if len(self.name) > self.max_name_length:
-        raise ValueError(
-            "Index too long for multiple database support. Is self.suffix longer than 3 characters?"
-        )
-    if self.name[0] == "_" or self.name[0].isdigit():
-        self.name = f"D{self.name[1:]}"
-
-
 def register_indexes():
     BuiltinLookup.as_mql_idx = builtin_lookup_idx
     Index._get_condition_mql = _get_condition_mql
     Index.get_pymongo_index_model = get_pymongo_index_model
-    Index.set_name_with_model = set_name_with_model
     WhereNode.as_mql_idx = where_node_idx

django_mongodb_backend/schema.py

@@ -7,7 +7,7 @@
 from .fields import EmbeddedModelField
 from .gis.schema import GISSchemaEditor
 from .query import wrap_database_errors
-from .utils import OperationCollector, get_field
+from .utils import OperationCollector
 
 
 def ignore_embedded_models(func):
@@ -249,7 +249,7 @@ def alter_unique_together(
             )
         # Created uniques
         for field_names in news.difference(olds):
-            columns = [get_field(model, field).column for field in field_names]
+            columns = [model._meta.get_field(field).column for field in field_names]
             name = str(
                 self._unique_constraint_name(
                     model._meta.db_table, [column_prefix + col for col in columns]

django_mongodb_backend/utils.py

@@ -5,7 +5,6 @@
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db.backends.utils import logger
-from django.db.models.constants import LOOKUP_SEP
 from django.utils.functional import SimpleLazyObject
 from django.utils.text import format_lazy
 from django.utils.version import get_version_tuple
@@ -187,21 +186,3 @@ def wrapper(self, *args, **kwargs):
             self.log(method, args, kwargs)
 
         return wrapper
-
-
-def get_field(model, field_name):
-    from .fields import EmbeddedModelField  # noqa: PLC0415
-
-    if LOOKUP_SEP in field_name:
-        previous = model
-        keys = field_name.split(LOOKUP_SEP)
-        path = []
-        for field in keys:
-            field = previous._meta.get_field(field)
-            previous = field.embedded_model if isinstance(field, EmbeddedModelField) else field
-            path.append(field.column)
-        column = ".".join(path)
-        embedded_column = field.clone()
-        embedded_column.column = column
-        return embedded_column
-    return model._meta.get_field(field_name)

tests/schema_/test_embedded_model.py

@@ -545,10 +545,10 @@ class Book(models.Model):
             class Meta:
                 app_label = "schema_"
                 unique_together = [
-                    ("author__unique_together_three", "author__unique_together_four"),
+                    ("author.unique_together_three", "author.unique_together_four"),
                     (
-                        "author__address__unique_together_one",
-                        "author__address__unique_together_two",
+                        "author.address.unique_together_one",
+                        "author.address.unique_together_two",
                     ),
                 ]
 
@@ -599,8 +599,8 @@ class Book(models.Model):
             class Meta:
                 app_label = "schema_"
                 indexes = [
-                    models.Index(fields=["author__indexed_two"]),
-                    models.Index(fields=["author__address__indexed_one"]),
+                    models.Index(fields=["author.indexed_two"]),
+                    models.Index(fields=["author.address.indexed_one"]),
                 ]
 
         new_field = EmbeddedModelField(Author)
@@ -649,11 +649,11 @@ class Meta:
                 app_label = "schema_"
                 constraints = [
                     models.UniqueConstraint(
-                        fields=["author__unique_constraint_two"],
+                        fields=["author.unique_constraint_two"],
                         name="unique_two",
                     ),
                     models.UniqueConstraint(
-                        fields=["author__address__unique_constraint_one"],
+                        fields=["author.address.unique_constraint_one"],
                         name="unique_one",
                     ),
                 ]