X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=d49b44a41d1977c8b37fdd6266b3df9fca662bfb;hp=f5c402040f8826ce05a38d5947c30998bbc9591e;hb=c04580563f978929bc4f06dfa85ea7a26248d688;hpb=f6a7be3e0e92faae7d60e807d584c9560c988ae7

diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py
index f5c4020..d49b44a 100644
--- a/ldapdb/models/query.py
+++ b/ldapdb/models/query.py
@@ -75,11 +75,11 @@ class WhereNode(BaseWhereNode):
             obj = Constraint(obj.alias, obj.col, obj.field)
         super(WhereNode, self).add((obj, lookup_type, value), connector)
 
-    def as_sql(self, qn=None):
+    def as_sql(self, qn=None, connection=None):
         bits = []
         for item in self.children:
-            if isinstance(item, WhereNode):
-                sql, params = item.as_sql()
+            if hasattr(item, 'as_sql'):
+                sql, params = item.as_sql(qn=qn, connection=connection)
                 bits.append(sql)
                 continue
 
@@ -185,8 +185,10 @@ class Query(BaseQuery):
             for field in iter(self.model._meta.fields):
                 if field.attname == 'dn':
                     row.append(dn)
+                elif hasattr(field, 'from_ldap'):
+                    row.append(field.from_ldap(attrs.get(field.db_column, []), connection=ldapdb.connection))
                 else:
-                    row.append(attrs.get(field.db_column, None))
+                    row.append(None)
             yield row
 
 class QuerySet(BaseQuerySet):