Raise NotSupportedError on QuerySet extras

- RawSQL
- ExtraWhere

Author: aclark4life

django_mongodb/expressions.py

@@ -13,6 +13,7 @@
     F,
     NegatedExpression,
     OrderBy,
+    RawSQL,
     Ref,
     ResolvedOuterRef,
     Star,
@@ -21,6 +22,7 @@
     When,
 )
 from django.db.models.sql import Query
+from django.db.models.sql.where import ExtraWhere
 
 
 def case(self, compiler, connection):
@@ -66,6 +68,10 @@ def expression_wrapper(self, compiler, connection):
     return self.expression.as_mql(compiler, connection)
 
 
+def extra_where(self, compiler, connection):  # noqa: ARG001
+    raise NotSupportedError("QuerySet extras are not supported on MongoDB.")
+
+
 def f(self, compiler, connection):  # noqa: ARG001
     return f"${self.name}"
 
@@ -81,6 +87,8 @@ def order_by(self, compiler, connection):
 def query(self, compiler, connection):  # noqa: ARG001
     raise NotSupportedError("Using a QuerySet in annotate() is not supported on MongoDB.")
 
+def raw_sql(self, compiler, connection):  # noqa: ARG001
+    raise NotSupportedError("QuerySet extras are not supported on MongoDB.")
 
 def ref(self, compiler, connection):  # noqa: ARG001
     prefix = (
@@ -125,11 +133,13 @@ def register_expressions():
     Case.as_mql = case
     Col.as_mql = col
     CombinedExpression.as_mql = combined_expression
+    ExtraWhere.as_mql = extra_where
     ExpressionWrapper.as_mql = expression_wrapper
     F.as_mql = f
     NegatedExpression.as_mql = negated_expression
     OrderBy.as_mql = order_by
     Query.as_mql = query
+    RawSQL.as_mql = raw_sql
     Ref.as_mql = ref
     ResolvedOuterRef.as_mql = ResolvedOuterRef.as_sql
     Star.as_mql = star

django_mongodb/features.py

@@ -68,15 +68,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
         "aggregation.tests.AggregateTestCase.test_reverse_fkey_annotate",
         "aggregation_regress.tests.AggregationTests.test_annotation_disjunction",
         "aggregation_regress.tests.AggregationTests.test_decimal_aggregate_annotation_filter",
-        # QuerySet.extra(select=...) should raise NotSupportedError instead of:
-        # 'RawSQL' object has no attribute 'as_mql'.
-        "aggregation_regress.tests.AggregationTests.test_annotate_with_extra",
-        "aggregation_regress.tests.AggregationTests.test_annotation",
-        "aggregation_regress.tests.AggregationTests.test_more_more3",
-        "aggregation_regress.tests.AggregationTests.test_more_more_more3",
-        # QuerySet.extra(where=...) should raise NotSupportedError instead of:
-        # 'ExtraWhere' object has no attribute 'as_mql'.
-        "many_to_one.tests.ManyToOneTests.test_selects",
         # Incorrect JOIN with GenericRelation gives incorrect results.
         "aggregation_regress.tests.AggregationTests.test_aggregation_with_generic_reverse_relation",
         "generic_relations.tests.GenericRelationsTests.test_queries_content_type_restriction",
@@ -673,6 +664,17 @@ def django_test_expected_failures(self):
             "backends.base.test_base.DatabaseWrapperLoggingTests",
             "migrations.test_operations.OperationTests.test_run_python_atomic",
         },
+        "QuerySet extras are not supported on MongoDB": {
+            # QuerySet.extra(select=...) raises NotSupportedError instead of:
+            # 'RawSQL' object has no attribute 'as_mql'.
+            "aggregation_regress.tests.AggregationTests.test_annotate_with_extra",
+            "aggregation_regress.tests.AggregationTests.test_annotation",
+            "aggregation_regress.tests.AggregationTests.test_more_more3",
+            "aggregation_regress.tests.AggregationTests.test_more_more_more3",
+            # QuerySet.extra(where=...) should raise NotSupportedError instead of:
+            # 'ExtraWhere' object has no attribute 'as_mql'.
+            "many_to_one.tests.ManyToOneTests.test_selects",
+        },
     }
 
     @cached_property