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
use all object classes when performing search
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index eb35061ca41e5eb889c34d0e0b90c4425ee9f737..f5c402040f8826ce05a38d5947c30998bbc9591e 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-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