[soc2010/query-refactor] Provide a more useful error message on disjunctions.

alex · alex · commit 9c6e1c89c595 · 2010-07-19T21:04:03.000Z
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/contrib/mongodb/compiler.py b/django/contrib/mongodb/compiler.py
@@ -25,6 +25,9 @@ def __init__(self, query, connection, using):
         self.using = using
     
     def get_filters(self, where):
+        if where.connector != "AND":
+            raise UnsupportedDatabaseOperation("MongoDB only supports joining "
+                "filters with and, not or.")
         assert where.connector == "AND"
         filters = {}
         for child in where.children:
diff --git a/tests/regressiontests/mongodb/tests.py b/tests/regressiontests/mongodb/tests.py
@@ -1,5 +1,5 @@
 from django.db import connection, UnsupportedDatabaseOperation
-from django.db.models import Count, Sum, F
+from django.db.models import Count, Sum, F, Q
 from django.test import TestCase
 
 from models import Artist, Group
@@ -392,3 +392,7 @@ def test_unsupported_ops(self):
         self.assert_unsupported(
             lambda: Artist.objects.aggregate(Count("id"), Count("pk"))
         )
+        
+        self.assert_unsupported(
+            Artist.objects.filter(Q(pk=0) | Q(pk=1))
+        )
