X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=b8e4897a645e1132424c1b735aff28928235408d;hp=a8c614f7ccfe6a2ee487ac35b38bb474951efa0c;hb=15ab751beb0021ef73455d55b96eddbf01bcfffb;hpb=c691191aa52b340fd060957aeaf3d53594074a00 diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index a8c614f..b8e4897 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -81,15 +81,14 @@ class WhereNode(BaseWhereNode): if isinstance(item, WhereNode): bits.append(item.as_sql()) continue - constraint, x, y, values = item + constraint, lookup_type, y, values = item + comp = get_lookup_operator(lookup_type) if hasattr(constraint, "col"): # django 1.2 - comp = get_lookup_operator(constraint.lookup_type) clause = "(%s%s%s)" % (constraint.col, comp, values) else: # django 1.1 (table, column, db_type) = constraint - comp = get_lookup_operator(x) equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ] if len(equal_bits) == 1: clause = equal_bits[0]