INTPYTHON-935 Fix QuerySet.extra(where=...) crash

Author: timgraham

django_mongodb_backend/compiler.py

@@ -13,7 +13,7 @@
 from django.db.models.sql import compiler
 from django.db.models.sql.constants import GET_ITERATOR_CHUNK_SIZE, MULTI, SINGLE
 from django.db.models.sql.datastructures import BaseTable
-from django.db.models.sql.where import AND, OR, XOR, NothingNode, WhereNode
+from django.db.models.sql.where import AND, OR, XOR, ExtraWhere, NothingNode, WhereNode
 from django.utils.functional import cached_property
 from pymongo import ASCENDING, DESCENDING
 
@@ -733,7 +733,7 @@ def _get_pushable_conditions(self):
 
     @classmethod
     def _collect_pushable(cls, expr, negated=False):
-        if expr is None or isinstance(expr, NothingNode):
+        if expr is None or isinstance(expr, (NothingNode, ExtraWhere)):
             return {}
         if isinstance(expr, WhereNode):
             # Apply De Morgan: track negation so connectors are flipped

django_mongodb_backend/query.py

@@ -166,7 +166,7 @@ def get_pipeline(self):
         return pipeline
 
 
-def extra_where(self, compiler, connection):  # noqa: ARG001
+def extra_where(self, compiler, connection, as_expr=False):  # noqa: ARG001
     raise NotSupportedError("QuerySet.extra() is not supported on MongoDB.")
 
 

docs/releases/6.0.x.rst

@@ -35,6 +35,9 @@ Bug fixes
   that references in migrations don't need to be adjusted if models are later
   removed.
 
+- Fixed ``QuerySet.extra(where=...)`` crash (rather than raising
+  ``NotSupportedError``).
+
 Deprecated features
 -------------------
 

tests/queries_/test_extra.py

@@ -0,0 +1,12 @@
+from django.db import NotSupportedError
+from django.test import TestCase
+
+from .models import Author
+
+
+class ExtraTests(TestCase):
+    def test_where(self):
+        author = Author.objects.create()
+        msg = "QuerySet.extra() is not supported on MongoDB."
+        with self.assertRaisesMessage(NotSupportedError, msg):
+            self.assertCountEqual(Author.objects.extra(where=["id=%s"], params=[author.id]), author)