X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=ldapdb%2Fmodels%2Fquery.py;h=bbb46e2553f991e124bbcbc16d1ee3bed0d71beb;hb=82901736cde9aae9fbe8b6acc0aad2141ecd9583;hp=d0958b18c4386bb38c019327c293c7d84f8c29d4;hpb=a6255cb185ff6ce55d8760ef9b3aefbb9ddc4194;p=matthijs%2Fupstream%2Fdjango-ldapdb.git diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index d0958b1..bbb46e2 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -103,8 +103,13 @@ class Compiler(object): else: negate = False field = query.model._meta.get_field(fieldname) - attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection).lower() - attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection).lower() + attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection) + attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection) + # perform case insensitive comparison + if hasattr(attr_x, 'lower'): + attr_x = attr_x.lower() + if hasattr(attr_y, 'lower'): + attr_y = attr_y.lower() val = negate and cmp(attr_y, attr_x) or cmp(attr_x, attr_y) if val: return val