rework tests

[matthijs/upstream/django-ldapdb.git] / ldapdb / models / query.py

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 67d193607b7bc77c09ac74c4a802388a185df6f1..b8e4897a645e1132424c1b735aff28928235408d 100644 (file)
--- 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
@@ -73,14 +81,15 @@ 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
-                clause = "(%s=%s)" % (constraint.col, values)
+                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
+                equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ]
                 if len(equal_bits) == 1:
                     clause = equal_bits[0]
                 else: