Remove contained_by and all lookups

Author: WaVEV

django_mongodb_backend/fields/embedded_model_array.py

@@ -92,8 +92,6 @@ class _EmbeddedModelArrayOutputField(ArrayField):
         "gte",
         "lt",
         "lte",
-        "all",
-        "contained_by",
     }
 
     def get_lookup(self, name):
@@ -166,23 +164,6 @@ class EmbeddedModelArrayFieldLessThanOrEqual(
     pass
 
 
-@_EmbeddedModelArrayOutputField.register_lookup
-class EmbeddedModelArrayFieldAll(EmbeddedModelArrayFieldBuiltinLookup, Lookup):
-    lookup_name = "all"
-    get_db_prep_lookup_value_is_iterable = False
-
-    def as_mql(self, compiler, connection):
-        lhs_mql = process_lhs(self, compiler, connection)
-        values = process_rhs(self, compiler, connection)
-        return {
-            "$and": [
-                {"$ne": [lhs_mql, None]},
-                {"$ne": [values, None]},
-                {"$setIsSubset": [values, lhs_mql]},
-            ]
-        }
-
-
 class KeyTransform(Transform):
     def __init__(self, key_name, array_field, *args, **kwargs):
         super().__init__(*args, **kwargs)

docs/source/ref/models/fields.rst

@@ -448,58 +448,6 @@ Examples:
     Post.objects.filter(tags__rating__lte=3)
     <QuerySet [<Post: First post>, <Post: Second post>]>
 
-.. fieldlookup:: embeddedmodelarrayfield.all
-
-``all``
-^^^^^^^
-
-Returns objects where **all** values provided on the right-hand side are
-present. It requires that *every* value be matched by some document in
-the array.
-
-Example:
-
-.. code-block:: pycon
-
-    Post.objects.create(
-        name="First post", tags=[Tag(label="django"), Tag(label="rest")]
-    )
-    Post.objects.create(
-        name="Second post", tags=[Tag(label="django")]
-    )
-
-    Post.objects.filter(tags__label__all=["django", "rest"])
-    <QuerySet [<Post: First post>]>
-
-    Post.objects.filter(tags__label__all=["django"])
-    <QuerySet [<Post: First post>, <Post: Second post>]>
-
-.. fieldlookup:: embeddedmodelarrayfield.contained_by
-
-``contained_by``
-^^^^^^^^^^^^^^^^
-
-Returns objects where the embedded model array is **contained by** the list of
-values on the right-hand side. In other words, every value in the embedded
-array must be present in the given list.
-
-Example:
-
-.. code-block:: pycon
-
-    Post.objects.create(
-        name="First post", tags=[Tag(label="django"), Tag(label="rest")]
-    )
-    Post.objects.create(
-        name="Second post", tags=[Tag(label="django")]
-    )
-
-    Post.objects.filter(tags__label__contained_by=["django", "rest", "api"])
-    <QuerySet [<Post: First post>, <Post: Second post>]>
-
-    Post.objects.filter(tags__label__contained_by=["django"])
-    <QuerySet [<Post: Second post>]>
-
 ``ObjectIdAutoField``
 ---------------------
 

tests/model_fields_/test_embedded_model_array.py

@@ -182,17 +182,6 @@ def test_filter_unsupported_lookups(self):
                 self.assertCountEqual(MuseumExhibit.objects.filter(**kwargs), [])
                 self.assertIn(f"'field': '{lookup}'", captured_queries[0]["sql"])
 
-    def test_all_filter(self):
-        self.assertCountEqual(
-            MuseumExhibit.objects.filter(sections__section_number__all=[1, 2]), [self.wonders]
-        )
-
-    def test_contained_by(self):
-        self.assertCountEqual(
-            MuseumExhibit.objects.filter(sections__section_number__contained_by=[1, 2, 3]),
-            [self.egypt, self.new_descoveries, self.wonders, self.lost_empires],
-        )
-
     def test_len_filter(self):
         self.assertCountEqual(MuseumExhibit.objects.filter(sections__len=10), [])
         self.assertCountEqual(
@@ -305,9 +294,8 @@ def test_foreign_field_exact(self):
         self.assertCountEqual(qs, [self.egypt_tour, self.wonders_tour])
 
     def test_foreign_field_with_slice(self):
-        # Only wonders exhibit has exactly two sections, and this slice matches first two
-        qs = Tour.objects.filter(exhibit__sections__0_2__section_number__all=[1, 2])
-        self.assertEqual(list(qs), [self.wonders_tour])
+        qs = Tour.objects.filter(exhibit__sections__0_2__section_number__in=[1, 2])
+        self.assertCountEqual(qs, [self.wonders_tour, self.egypt_tour])
 
 
 @isolate_apps("model_fields_")