X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=1fddeeeb1aea3b8bb0ece0f4a7b079fa8d802b84;hp=ab5f19ec727b574cc845d44995d1b4371611ead7;hb=641160553d6db632259d325be2b22ee7c3059f3c;hpb=d148d9497b40bbfe0a1056e73e72415281f9ef9f

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index ab5f19e..1fddeee 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -190,10 +190,11 @@ class WhereNode(BaseWhereNode):
                 else:
                     clause = '(|%s)' % ''.join(equal_bits)
 
-            if self.negated:
-                bits.append('(!%s)' % clause)
-            else:
-                bits.append(clause)
+            bits.append(clause)
+
+        if not len(bits):
+            return '', []
+
         if len(bits) == 1:
             sql_string = bits[0]
         elif self.connector == AND:
@@ -202,6 +203,10 @@ class WhereNode(BaseWhereNode):
             sql_string = '(|%s)' % ''.join(bits)
         else:
             raise Exception("Unhandled WHERE connector: %s" % self.connector)
+
+        if self.negated:
+            sql_string = ('(!%s)' % sql_string)
+
         return sql_string, []
 
 class Query(BaseQuery):