Issue #89: Don't silently fail when using multiple $or conditions

Author: jonashaag

django_mongodb_engine/compiler.py

@@ -136,6 +136,7 @@ def add_filters(self, filters, query=None):
             query = self._mongo_query
 
         if filters.connector == OR:
+            assert '$or' not in query, "Multiple ORs are not supported"
             or_conditions = query['$or'] = []
 
         if filters.negated:
@@ -153,7 +154,7 @@ def add_filters(self, filters, query=None):
                         raise DatabaseError("Nested ORs are not supported")
 
                 if filters.connector == OR and filters.negated:
-                    raise NotImplementedError("Negated ORs are not implemented")
+                    raise NotImplementedError("Negated ORs are not supported")
 
                 self.add_filters(child, query=subquery)
 

tests/mongodb/tests.py

@@ -2,6 +2,7 @@
 from django.core.management import call_command
 from django.db import connection, connections
 from django.db.utils import DatabaseError, IntegrityError
+from django.db.models import Q
 from django.contrib.sites.models import Site
 
 from pymongo.objectid import InvalidId
@@ -170,6 +171,11 @@ def test_multiple_exclude_random(self):
                 q = getattr(q, 'filter' if randint(0, 1) else 'exclude')(raw=i)
             list(q)
 
+    def test_issue_89(self):
+        query = [Q(raw='a') | Q(raw='b'),
+                 Q(raw='c') | Q(raw='d')]
+        self.assertRaises(AssertionError, RawModel.objects.get, *query)
+
 class DatabaseOptionTests(TestCase):
     """ Tests for MongoDB-specific database options """