projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
case insensitive sorting
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index 0aba5be23280063259e8b236f48d5b2d1345f577..367cd2cec1eadae0cdecc06d241f5f27bf0ed860 100644
(file)
--- 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 ]
# 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]
clause = equal_bits[0]
+ else:
+ clause = '(|%s)' % ''.join(equal_bits)
if self.negated:
bits.append('(!%s)' % clause)
else:
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 = []
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))
return keys
vals = sorted(vals, key=lambda x: getkey(x))