projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move field conversion
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index eb35061ca41e5eb889c34d0e0b90c4425ee9f737..d49b44a41d1977c8b37fdd6266b3df9fca662bfb 100644
(file)
--- 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)
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:
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
bits.append(sql)
continue
@@
-122,8
+122,7
@@
class Query(BaseQuery):
self.connection = ldapdb.connection
def get_count(self):
self.connection = ldapdb.connection
def get_count(self):
- # FIXME: use all object classes
- filterstr = '(objectClass=%s)' % self.model.object_classes[0]
+ filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
sql, params = self.where.as_sql()
filterstr += sql
filterstr = '(&%s)' % filterstr
sql, params = self.where.as_sql()
filterstr += sql
filterstr = '(&%s)' % filterstr
@@
-141,8
+140,7
@@
class Query(BaseQuery):
return len(vals)
def results_iter(self):
return len(vals)
def results_iter(self):
- # FIXME: use all object classes
- filterstr = '(objectClass=%s)' % self.model.object_classes[0]
+ filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
sql, params = self.where.as_sql()
filterstr += sql
filterstr = '(&%s)' % filterstr
sql, params = self.where.as_sql()
filterstr += sql
filterstr = '(&%s)' % filterstr
@@
-187,8
+185,10
@@
class Query(BaseQuery):
for field in iter(self.model._meta.fields):
if field.attname == 'dn':
row.append(dn)
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:
else:
- row.append(
attrs.get(field.db_column, None)
)
+ row.append(
None
)
yield row
class QuerySet(BaseQuerySet):
yield row
class QuerySet(BaseQuerySet):