X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=ae4b73c7b559a3eac87e4953935b271c4a46bba1;hb=8ba89c04b8902950edf7287bc83cb4dbfe039532;hp=0aba5be23280063259e8b236f48d5b2d1345f577;hpb=6ee56eaf3b6df1deb055443f85aecb0437cf8f29;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 0aba5be..ae4b73c 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -24,28 +24,78 @@ import ldap
 from django.db.models.query import QuerySet as BaseQuerySet
 from django.db.models.query_utils import Q
 from django.db.models.sql import Query as BaseQuery
-from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
+from django.db.models.sql.where import WhereNode as BaseWhereNode, Constraint as BaseConstraint, AND, OR
 
 import ldapdb
 
+def escape_ldap_filter(value):
+    value = str(value)
+    return value.replace('\\', '\\5c') \
+                .replace('*', '\\2a') \
+                .replace('(', '\\28') \
+                .replace(')', '\\29') \
+                .replace('\0', '\\00')
+
+class Constraint(BaseConstraint):
+    """
+    An object that can be passed to WhereNode.add() and knows how to
+    pre-process itself prior to including in the WhereNode.
+    """
+    def process(self, lookup_type, value):
+        """
+        Returns a tuple of data suitable for inclusion in a WhereNode
+        instance.
+        """
+        # Because of circular imports, we need to import this here.
+        from django.db.models.base import ObjectDoesNotExist
+
+        if lookup_type == 'endswith':
+            params = ["*%s" % escape_ldap_filter(value)]
+        elif lookup_type == 'startswith':
+            params = ["%s*" % escape_ldap_filter(value)]
+        elif lookup_type == 'contains':
+            params = ["*%s*" % escape_ldap_filter(value)]
+        elif lookup_type == 'exact':
+            params = [escape_ldap_filter(value)]
+        elif lookup_type == 'in':
+            params = [escape_ldap_filter(v) for v in value]
+        else:
+            raise TypeError("Field has invalid lookup: %s" % lookup_type)
+
+        try:
+            if self.field:
+                db_type = self.field.db_type()
+            else:
+                db_type = None
+        except ObjectDoesNotExist:
+            raise EmptyShortCircuit
+
+        return (self.alias, self.col, db_type), params
+
 class WhereNode(BaseWhereNode):
+    def add(self, data, connector):
+        if not isinstance(data, (list, tuple)):
+            super(WhereNode, self).add(data, connector)
+            return
+
+        # we replace the native Constraint by our own
+        obj, lookup_type, value = data
+        if hasattr(obj, "process"):
+            obj = Constraint(obj.alias, obj.col, obj.field)
+        super(WhereNode, self).add((obj, lookup_type, value), connector)
+
     def as_sql(self):
         bits = []
         for item in self.children:
             if isinstance(item, WhereNode):
                 bits.append(item.as_sql())
                 continue
-            if len(item) == 4:
-                # django 1.1
-                (table, column, type), x, y, values = item
-            else:
-                # django 1.0
-                table, column, type, x, y, values = item
+            (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]
+            else:
+                clause = '(|%s)' % ''.join(equal_bits)
             if self.negated:
                 bits.append('(!%s)' % clause)
             else:
@@ -88,7 +138,7 @@ class Query(BaseQuery):
             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, '').lower())
             return keys
         vals = sorted(vals, key=lambda x: getkey(x))