Erase embedded doc comparison.

Author: WaVEV

django_mongodb_backend/fields/embedded_model_array.py

@@ -1,7 +1,6 @@
 import difflib
 
 from django.core.exceptions import FieldDoesNotExist
-from django.db import models
 from django.db.models import Field
 from django.db.models.expressions import Col
 from django.db.models.lookups import Lookup, Transform
@@ -63,30 +62,10 @@ def get_transform(self, name):
 @EmbeddedModelArrayField.register_lookup
 class EMFArrayExact(EMFExact):
     def as_mql(self, compiler, connection):
-        lhs_mql = process_lhs(self, compiler, connection)
+        if not isinstance(self.lhs, KeyTransform):
+            raise ValueError("error")
+        lhs_mql, inner_lhs_mql = process_lhs(self, compiler, connection)
         value = process_rhs(self, compiler, connection)
-        if isinstance(self.lhs, KeyTransform):
-            lhs_mql, inner_lhs_mql = lhs_mql
-        else:
-            inner_lhs_mql = "$$item"
-        if isinstance(value, models.Model):
-            value, emf_data = self.model_to_dict(value)
-            # Get conditions for any nested EmbeddedModelFields.
-            conditions = self.get_conditions({inner_lhs_mql: (value, emf_data)})
-            return {
-                "$anyElementTrue": {
-                    "$ifNull": [
-                        {
-                            "$map": {
-                                "input": lhs_mql,
-                                "as": "item",
-                                "in": {"$and": conditions},
-                            }
-                        },
-                        [],
-                    ]
-                }
-            }
         return {
             "$anyElementTrue": {
                 "$ifNull": [
@@ -122,43 +101,22 @@ def process_rhs(self, compiler, connection):
         return None, [get_db_prep_value(v, connection, prepared=True) for v in values]
 
     def as_mql(self, compiler, connection):
-        lhs_mql = process_lhs(self, compiler, connection)
-        values = process_rhs(self, compiler, connection)
         # Querying a subfield within the array elements (via nested KeyTransform).
         # Replicates MongoDB's implicit ANY-match by mapping over the array and applying
         # `$in` on the subfield.
-        if isinstance(self.lhs, KeyTransform):
-            lhs_mql, inner_lhs_mql = lhs_mql
-            return {
-                "$anyElementTrue": {
-                    "$ifNull": [
-                        {
-                            "$map": {
-                                "input": lhs_mql,
-                                "as": "item",
-                                "in": {"$in": [inner_lhs_mql, values]},
-                            }
-                        },
-                        [],
-                    ]
-                }
-            }
-        conditions = []
-        inner_lhs_mql = "$$item"
-        # Querying full embedded documents in the array.
-        # Builds `$or` conditions and maps them over the array to match any full document.
-        for value in values:
-            value, emf_data = self.model_to_dict(value)
-            # Get conditions for any nested EmbeddedModelFields.
-            conditions.append({"$and": self.get_conditions({inner_lhs_mql: (value, emf_data)})})
+        if not isinstance(self.lhs, KeyTransform):
+            raise ValueError()
+        lhs_mql = process_lhs(self, compiler, connection)
+        values = process_rhs(self, compiler, connection)
+        lhs_mql, inner_lhs_mql = lhs_mql
         return {
             "$anyElementTrue": {
                 "$ifNull": [
                     {
                         "$map": {
                             "input": lhs_mql,
                             "as": "item",
-                            "in": {"$or": conditions},
+                            "in": {"$in": [inner_lhs_mql, values]},
                         }
                     },
                     [],

tests/model_fields_/test_embedded_model.py

@@ -18,16 +18,11 @@
 from django_mongodb_backend.models import EmbeddedModel
 
 from .models import (
-    A,
     Address,
     ArtifactDetail,
     Author,
-    B,
     Book,
-    C,
-    D,
     Data,
-    E,
     ExhibitSection,
     Holder,
     Library,
@@ -240,12 +235,6 @@ def test_filter_with_field(self):
             Movie.objects.filter(reviews__title="Horrible"), [self.clouds, self.frozen]
         )
 
-    def test_filter_with_model(self):
-        self.assertCountEqual(
-            Movie.objects.filter(reviews=Review(title="Horrible", rating=2)),
-            [self.frozen],
-        )
-
     def test_filter_with_embeddedfield_path(self):
         self.assertCountEqual(
             MuseumExhibit.objects.filter(sections__0__section_number=1),
@@ -294,27 +283,6 @@ def test_overlap_simplefield(self):
             MuseumExhibit.objects.filter(sections__section_number__overlap=[2]), [self.wonders]
         )
 
-    def test_overlap_emf(self):
-        self.assertSequenceEqual(
-            Movie.objects.filter(reviews__overlap=[Review(title="The best", rating=10)]),
-            [self.clouds],
-        )
-
-    def test_overlap_values(self):
-        qs = Movie.objects.filter(title__in=["Clouds", "Frozen"])
-        self.assertCountEqual(
-            Movie.objects.filter(
-                reviews__overlap=qs.values_list("reviews"),
-            ),
-            [self.clouds, self.frozen],
-        )
-        self.assertCountEqual(
-            Movie.objects.filter(
-                reviews__overlap=qs.values("reviews"),
-            ),
-            [self.clouds, self.frozen],
-        )
-
 
 class QueryingTests(TestCase):
     @classmethod