X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=367cd2cec1eadae0cdecc06d241f5f27bf0ed860;hb=85ee2b0a3d2ee52fc31dd8991594c07ba5cfc4b1;hp=0aba5be23280063259e8b236f48d5b2d1345f577;hpb=6ee56eaf3b6df1deb055443f85aecb0437cf8f29;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 0aba5be..367cd2c 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -42,10 +42,10 @@ class WhereNode(BaseWhereNode):
                 # django 1.0
                 table, column, type, x, y, values = item
             equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
-            if len(equal_bits) > 1:
-                clause = '(|%s)' % ''.join(equal_bits)
-            else:
+            if len(equal_bits) == 1:
                 clause = equal_bits[0]
+            else:
+                clause = '(|%s)' % ''.join(equal_bits)
             if self.negated:
                 bits.append('(!%s)' % clause)
             else:
@@ -88,7 +88,7 @@ class Query(BaseQuery):
             keys = []
             for k in ordering:
                 attr = self.model._meta.get_field(k).db_column
-                keys.append(x[1].get(attr, None))
+                keys.append(x[1].get(attr, None).lower())
             return keys
         vals = sorted(vals, key=lambda x: getkey(x))