edits

Author: timgraham

django_mongodb/base.py

@@ -127,12 +127,6 @@ def _isnull_operator(a, b):
         "lt": lambda a, b: {a: {"$lt": b}},
         "lte": lambda a, b: {a: {"$lte": b}},
         "in": lambda a, b: {a: {"$in": b}},
-        # Partial indexes do not support the $not expression.
-        # Operators like $exists: False, $ne, and $nor cannot be used in partial indexes.
-        # So, indexes on null values (isnull=True|False) can't be implemented.
-        "isnull": lambda a, b: {},  # noqa: ARG005
-        # Partial indexes do not support the $regex expression.
-        "contains": lambda a, b: {},  # noqa: ARG005
     }
 
     display_name = "MongoDB"

django_mongodb/features.py

@@ -57,11 +57,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "db_functions.datetime.test_extract_trunc.DateFunctionWithTimeZoneTests.test_trunc_timezone_applied_before_truncation",
         # Length of null considered zero rather than null.
         "db_functions.text.test_length.LengthTests.test_basic",
-        # Partial indexes don't support multiple conditions. It requires this
-        # backend to convert $aggregate MQL syntax to $find (or else just
-        # generate $find syntax in the first place).
-        "indexes.tests.PartialIndexTests.test_is_null_condition",
-        "indexes.tests.PartialIndexTests.test_multiple_conditions",
         # Unexpected alias_refcount in alias_map.
         "queries.tests.Queries1Tests.test_order_by_tables",
         # The $sum aggregation returns 0 instead of None for null.
@@ -574,9 +569,6 @@ def django_test_expected_failures(self):
             # Probably something to do with lack of transaction support.
             "migration_test_data_persistence.tests.MigrationDataNormalPersistenceTestCase.test_persistence",
         },
-        "Partial indexes to be supported.": {
-            "indexes.tests.PartialIndexConditionIgnoredTests.test_condition_ignored",
-        },
         "Database caching not implemented.": {
             "cache.tests.CreateCacheTableForDBCacheTests",
             "cache.tests.DBCacheTests",

django_mongodb/indexes.py

@@ -22,7 +22,12 @@ def builtin_lookup_idx(self, compiler, connection):
         raise NotSupportedError("Expressions as indexes are not supported.")
     lhs_mql = self.lhs.target.column
     value = process_rhs(self, compiler, connection)
-    return connection.mongo_operators_idx[self.lookup_name](lhs_mql, value)
+    try:
+        return connection.mongo_operators_idx[self.lookup_name](lhs_mql, value)
+    except KeyError:
+        raise NotSupportedError(
+            f"MongoDB does not support the {self.lookup_name} lookup in indexes."
+        ) from None
 
 
 def where_node_idx(self, compiler, connection):

tests/indexes_/test_mql.py

@@ -1,15 +1,8 @@
 import operator
 
 from django.db import NotSupportedError, connection
-from django.db.models import (
-    Index,
-    Q,
-)
-from django.test import (
-    TestCase,
-    skipIfDBFeature,
-    skipUnlessDBFeature,
-)
+from django.db.models import Index, Q
+from django.test import TestCase, skipIfDBFeature, skipUnlessDBFeature
 
 from .models import Article
 
@@ -23,8 +16,8 @@ def test_not_supported(self):
                 condition=Q(pk__isnull=True) & Q(pk__contains="test1"),
             )
             self.assertEqual(
-                "{}",
-                str(index._get_condition_mql(Article, schema_editor=editor)),
+                index._get_condition_mql(Article, schema_editor=editor),
+                {},
             )
             editor.add_index(index=index, model=Article)
             with connection.cursor() as cursor:
@@ -37,41 +30,33 @@ def test_not_supported(self):
                 )
             editor.remove_index(index=index, model=Article)
 
-    def test_raises_on_negated(self):
-        with self.assertRaises(
-            NotSupportedError
-        ) as context_manager, connection.schema_editor() as editor:
+    def test_negated_not_supported(self):
+        msg = "Negated field in indexes is not supported."
+        with self.assertRaisesMessage(NotSupportedError, msg), connection.schema_editor() as editor:
             Index(
-                name="raises_on_negated",
+                name="test",
                 fields=["headline"],
                 condition=~Q(pk=True),
             )._get_condition_mql(Article, schema_editor=editor)
-        self.assertEqual(
-            context_manager.exception.args[0], "Negated field in indexes is not supported."
-        )
 
-    def test_raises_on_xor(self):
-        with self.assertRaises(
-            NotSupportedError
-        ) as context_manager, connection.schema_editor() as editor:
+    def test_xor_not_supported(self):
+        msg = "Xor in indexes is not supported."
+        with self.assertRaisesMessage(NotSupportedError, msg), connection.schema_editor() as editor:
             Index(
-                name="raises_on_negated",
+                name="test",
                 fields=["headline"],
                 condition=Q(pk=True) ^ Q(pk=False),
             )._get_condition_mql(Article, schema_editor=editor)
-        self.assertEqual(context_manager.exception.args[0], "Xor in indexes is not supported.")
 
     @skipIfDBFeature("is_mongodb_6_0")
-    def test_raises_on_or(self):
-        with self.assertRaises(
-            NotSupportedError
-        ) as context_manager, connection.schema_editor() as editor:
+    def test_or_not_supported(self):
+        msg = "Or in indexes is not supported."
+        with self.assertRaisesMessage(NotSupportedError, msg), connection.schema_editor() as editor:
             Index(
-                name="raises_on_negated",
+                name="test",
                 fields=["headline"],
                 condition=Q(pk=True) ^ Q(pk=False),
             )._get_condition_mql(Article, schema_editor=editor)
-        self.assertEqual(context_manager.exception.args[0], "Or in indexes is not supported.")
 
     @skipUnlessDBFeature("is_mongodb_6_0")
     def test_composite_index(self):
@@ -82,15 +67,14 @@ def test_composite_index(self):
                 condition=Q(number__gte=3) & (Q(text__gt="test1") | Q(text__in=["A", "B"])),
             )
             index._get_condition_mql(Article, schema_editor=editor)
-            target = {
-                "$and": [
-                    {"number": {"$gte": 3}},
-                    {"$or": [{"text": {"$gt": "test1"}}, {"text": {"$in": ["A", "B"]}}]},
-                ]
-            }
             self.assertEqual(
-                target,
                 index._get_condition_mql(Article, schema_editor=editor),
+                {
+                    "$and": [
+                        {"number": {"$gte": 3}},
+                        {"$or": [{"text": {"$gt": "test1"}}, {"text": {"$in": ["A", "B"]}}]},
+                    ]
+                },
             )
             editor.add_index(index=index, model=Article)
             with connection.cursor() as cursor: