X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Ffields.py;h=921923c052469ac826248bde9743b57d48c66ed6;hb=29c4b4ac0569ebb0877aa9b32211dc91afb248c5;hp=ff0ad722b8e75a8d0067933be4637170e1cf426b;hpb=4a1abcd053ba73b2c7e2db1068eb400468906e1a;p=matthijs%2Fupstream%2Fdjango-ldapdb.git

diff --git a/ldapdb/models/fields.py b/ldapdb/models/fields.py
index ff0ad72..921923c 100644
--- a/ldapdb/models/fields.py
+++ b/ldapdb/models/fields.py
@@ -28,6 +28,7 @@ class CharField(fields.CharField):
         super(CharField, self).__init__(*args, **kwargs)
 
     def get_db_prep_lookup(self, lookup_type, value):
+        "Returns field's value prepared for database lookup."
         if lookup_type == 'endswith':
             return ["*%s" % escape_ldap_filter(value)]
         elif lookup_type == 'startswith':
@@ -42,15 +43,27 @@ class CharField(fields.CharField):
         raise TypeError("CharField has invalid lookup: %s" % lookup_type)
 
     def get_prep_lookup(self, lookup_type, value):
-        return escape_ldap_filter(value)
-        
+        "Perform preliminary non-db specific lookup checks and conversions"
+        if lookup_type == 'endswith':
+            return "*%s" % escape_ldap_filter(value)
+        elif lookup_type == 'startswith':
+            return "%s*" % escape_ldap_filter(value)
+        elif lookup_type == 'contains':
+            return "*%s*" % escape_ldap_filter(value)
+        elif lookup_type == 'exact':
+            return escape_ldap_filter(value)
+        elif lookup_type == 'in':
+            return [escape_ldap_filter(v) for v in value]
+
+        raise TypeError("CharField has invalid lookup: %s" % lookup_type)
+
 class ImageField(fields.Field):
     def get_db_prep_lookup(self, lookup_type, value):
         raise TypeError("ImageField has invalid lookup: %s" % lookup_type)
 
 class IntegerField(fields.IntegerField):
     def get_db_prep_lookup(self, lookup_type, value):
-        if lookup_type == 'exact':
+        if lookup_type in ('exact', 'gte', 'lte'):
             return [value]
 
         raise TypeError("IntegerField has invalid lookup: %s" % lookup_type)