X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=a8c614f7ccfe6a2ee487ac35b38bb474951efa0c;hp=67d193607b7bc77c09ac74c4a802388a185df6f1;hb=ab216ac000ca0b6aeea64d9ce112395bbb7962d5;hpb=4a1abcd053ba73b2c7e2db1068eb400468906e1a diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index 67d1936..a8c614f 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -30,6 +30,14 @@ import ldapdb from ldapdb.models.fields import CharField +def get_lookup_operator(lookup_type): + if lookup_type == 'gte': + return '>=' + elif lookup_type == 'lte': + return '<=' + else: + return '=' + class Constraint(BaseConstraint): """ An object that can be passed to WhereNode.add() and knows how to @@ -76,11 +84,13 @@ class WhereNode(BaseWhereNode): constraint, x, y, values = item if hasattr(constraint, "col"): # django 1.2 - clause = "(%s=%s)" % (constraint.col, values) + comp = get_lookup_operator(constraint.lookup_type) + clause = "(%s%s%s)" % (constraint.col, comp, values) else: # django 1.1 - (table, column, type) = constraint - equal_bits = [ "(%s=%s)" % (column, value) for value in values ] + (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] else: