start moving charset conversion to fields

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

diff --git a/ldapdb/models/fields.py b/ldapdb/models/fields.py
index d21bbd0dc258c31bc05a35b8a1ee2d7a0b69eb07..201a63e74dfd77d92b5289116ca9ff94a29c78e7 100644 (file)
--- a/ldapdb/models/fields.py
+++ b/ldapdb/models/fields.py
@@ -28,11 +28,12 @@ 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':
             return ["%s*" % escape_ldap_filter(value)]
-        elif lookup_type == 'contains':
+        elif lookup_type in ['contains', 'icontains']:
             return ["*%s*" % escape_ldap_filter(value)]
         elif lookup_type == 'exact':
             return [escape_ldap_filter(value)]
@@ -41,24 +42,64 @@ class CharField(fields.CharField):
 
         raise TypeError("CharField has invalid lookup: %s" % lookup_type)
 
+    def get_db_prep_save(self, value, connection):
+        return [value.encode(connection.charset)]
+
     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 in ['contains', 'icontains']:
+            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):
+        "Returns field's value prepared for database lookup."
+        return [self.get_prep_lookup(lookup_type, value)]
+
+    def get_db_prep_save(self, value, connection):
+        return [value]
+
+    def get_prep_lookup(self, lookup_type, value):
+        "Perform preliminary non-db specific lookup checks and conversions"
         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 in ('exact', 'gte', 'lte'):
-            return [value]
+        "Returns field's value prepared for database lookup."
+        return [self.get_prep_lookup(lookup_type, value)]
 
+    def get_db_prep_save(self, value, connection):
+        return [str(value)]
+
+    def get_prep_lookup(self, lookup_type, value):
+        "Perform preliminary non-db specific lookup checks and conversions"
+        if lookup_type in ('exact', 'gte', 'lte'):
+            return value
         raise TypeError("IntegerField has invalid lookup: %s" % lookup_type)
 
 class ListField(fields.Field):
     __metaclass__ = SubfieldBase
 
     def get_db_prep_lookup(self, lookup_type, value):
+        "Returns field's value prepared for database lookup."
+        return [self.get_prep_lookup(lookup_type, value)]
+
+    def get_db_prep_save(self, value, connection):
+        return [x.encode(connection.charset) for x in value]
+
+    def get_prep_lookup(self, lookup_type, value):
+        "Perform preliminary non-db specific lookup checks and conversions"
+        if lookup_type == 'contains':
+            return escape_ldap_filter(value)
         raise TypeError("ListField has invalid lookup: %s" % lookup_type)
 
     def to_python(self, value):