X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=55576a6b4be1c44cb8427e49aff7c3eb29e4b42a;hp=069c237916f515b8b51bd4c909b5a054bf8cf532;hb=6035af62fccb4c3f623fd5be0072281f953790f5;hpb=f522a1edca8bccd27cefc6407a150ea5b98a2f07

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index 069c237..55576a6 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -28,7 +28,7 @@ from django.db.models.sql.where import WhereNode as BaseWhereNode, Constraint as
 
 import ldapdb
 
-from ldapdb.models.fields import CharField
+from ldapdb.models.fields import CharField, Integer, ListField
 
 def get_lookup_operator(lookup_type):
     if lookup_type == 'gte':
@@ -185,8 +185,12 @@ class Query(BaseQuery):
             for field in iter(self.model._meta.fields):
                 if field.attname == 'dn':
                     row.append(dn)
+                elif isinstance(field, IntegerField):
+                    row.append(int(attrs.get(field.db_column, [0])[0]))
+                elif isinstance(field, ListField):
+                    row.append(attrs.get(field.db_column, []))
                 else:
-                    row.append(attrs.get(field.db_column, None))
+                    row.append(attrs.get(field.db_column, [''])[0])
             yield row
 
 class QuerySet(BaseQuerySet):