refactor where in indexes.

Author: WaVEV

django_mongodb/indexes.py

@@ -1,4 +1,3 @@
-from django.core.exceptions import EmptyResultSet, FullResultSet
 from django.db import NotSupportedError
 from django.db.models import Index
 from django.db.models.fields.related_lookups import In
@@ -47,10 +46,6 @@ def in_idx(self, compiler, connection):
 
 
 def where_node_idx(self, compiler, connection):
-    if self.connector == AND:
-        full_needed, empty_needed = len(self.children), 1
-    else:
-        full_needed, empty_needed = 1, len(self.children)
     if self.connector == AND:
         operator = "$and"
     elif self.connector == XOR:
@@ -63,31 +58,14 @@ def where_node_idx(self, compiler, connection):
         raise NotSupportedError("MongoDB does not support the '~' operator in indexes.")
     children_mql = []
     for child in self.children:
-        try:
-            mql = child.as_mql_idx(compiler, connection)
-        except EmptyResultSet:
-            empty_needed -= 1
-        except FullResultSet:
-            full_needed -= 1
-        else:
-            if mql:
-                children_mql.append(mql)
-            else:
-                full_needed -= 1
-
-    if empty_needed == 0:
-        raise EmptyResultSet
-    if full_needed == 0:
-        return {}
-
+        mql = child.as_mql_idx(compiler, connection)
+        children_mql.append(mql)
     if len(children_mql) == 1:
         mql = children_mql[0]
     elif len(children_mql) > 1:
         mql = {operator: children_mql}
     else:
         mql = {}
-    if not mql:
-        raise FullResultSet
     return mql