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
don't forget to use offset/limit in get_count()
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index f433956d52071c5bdac9f71a842dcf565449193f..3076e3f3364905bf2a272be6ad31934641cde093 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-70,31
+70,30
@@
class Compiler(object):
self.using = using
def results_iter(self):
self.using = using
def results_iter(self):
- query = self.query
+ if self.query.select_fields:
+ fields = self.query.select_fields
+ else:
+ fields = self.query.model._meta.fields
- filterstr = ''.join(['(objectClass=%s)' % cls for cls in query.model.object_classes])
- sql, params = query.where.as_sql()
- filterstr += sql
- filterstr = '(&%s)' % filterstr
- attrlist = [ x.db_column for x in query.model._meta.local_fields if x.db_column ]
+ attrlist = [ x.db_column for x in fields if x.db_column ]
try:
vals = self.connection.search_s(
try:
vals = self.connection.search_s(
- query.model.base_dn,
+
self.
query.model.base_dn,
ldap.SCOPE_SUBTREE,
ldap.SCOPE_SUBTREE,
- filterstr=
filterstr
,
+ filterstr=
self.query._ldap_filter()
,
attrlist=attrlist,
)
attrlist=attrlist,
)
- except:
- r
aise query.model.DoesNotExist
+ except
ldap.NO_SUCH_OBJECT
:
+ r
eturn
# perform sorting
# perform sorting
- if query.extra_order_by:
- ordering = query.extra_order_by
- elif not query.default_ordering:
- ordering = query.order_by
+ if
self.
query.extra_order_by:
+ ordering =
self.
query.extra_order_by
+ elif not
self.
query.default_ordering:
+ ordering =
self.
query.order_by
else:
else:
- ordering =
query.order_by or
query.model._meta.ordering
+ ordering =
self.query.order_by or self.
query.model._meta.ordering
def cmpvals(x, y):
for fieldname in ordering:
if fieldname.startswith('-'):
def cmpvals(x, y):
for fieldname in ordering:
if fieldname.startswith('-'):
@@
-102,7
+101,7
@@
class Compiler(object):
negate = True
else:
negate = False
negate = True
else:
negate = False
- field = query.model._meta.get_field(fieldname)
+ field =
self.
query.model._meta.get_field(fieldname)
attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection)
attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection)
# perform case insensitive comparison
attr_x = field.from_ldap(x[1].get(field.db_column, []), connection=self.connection)
attr_y = field.from_ldap(y[1].get(field.db_column, []), connection=self.connection)
# perform case insensitive comparison
@@
-117,9
+116,17
@@
class Compiler(object):
vals = sorted(vals, cmp=cmpvals)
# process results
vals = sorted(vals, cmp=cmpvals)
# process results
+ pos = 0
for dn, attrs in vals:
for dn, attrs in vals:
+ # FIXME : This is not optimal, we retrieve more results than we need
+ # but there is probably no other options as we can't perform ordering
+ # server side.
+ if (self.query.low_mark and pos < self.query.low_mark) or \
+ (self.query.high_mark is not None and pos >= self.query.high_mark):
+ pos += 1
+ continue
row = []
row = []
- for field in iter(
query.model._meta.
fields):
+ for field in iter(fields):
if field.attname == 'dn':
row.append(dn)
elif hasattr(field, 'from_ldap'):
if field.attname == 'dn':
row.append(dn)
elif hasattr(field, 'from_ldap'):
@@
-127,6
+134,7
@@
class Compiler(object):
else:
row.append(None)
yield row
else:
row.append(None)
yield row
+ pos += 1
class WhereNode(BaseWhereNode):
class WhereNode(BaseWhereNode):
@@
-187,23
+195,31
@@
class Query(BaseQuery):
super(Query, self).__init__(*args, **kwargs)
self.connection = ldapdb.connection
super(Query, self).__init__(*args, **kwargs)
self.connection = ldapdb.connection
- def
get_count(self, using=None
):
+ def
_ldap_filter(self
):
filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
sql, params = self.where.as_sql()
filterstr += sql
filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
sql, params = self.where.as_sql()
filterstr += sql
-
filterstr =
'(&%s)' % filterstr
+
return
'(&%s)' % filterstr
+ def get_count(self, using=None):
try:
try:
- vals =
self
.connection.search_s(
+ vals =
ldapdb
.connection.search_s(
self.model.base_dn,
ldap.SCOPE_SUBTREE,
self.model.base_dn,
ldap.SCOPE_SUBTREE,
- filterstr=
filterstr
,
+ filterstr=
self._ldap_filter()
,
attrlist=[],
)
attrlist=[],
)
- except:
- raise self.model.DoesNotExist
+ except ldap.NO_SUCH_OBJECT:
+ return 0
+
+ number = len(vals)
+
+ # apply limit and offset
+ number = max(0, number - self.low_mark)
+ if self.high_mark is not None:
+ number = min(number, self.high_mark - self.low_mark)
- return
len(vals)
+ return
number
def get_compiler(self, using=None, connection=None):
return Compiler(self, ldapdb.connection, using)
def get_compiler(self, using=None, connection=None):
return Compiler(self, ldapdb.connection, using)
@@
-225,3
+241,19
@@
class QuerySet(BaseQuerySet):
query = Query(model, None, WhereNode)
super(QuerySet, self).__init__(model=model, query=query)
query = Query(model, None, WhereNode)
super(QuerySet, self).__init__(model=model, query=query)
+ def delete(self):
+ "Bulk deletion."
+ try:
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=self.query._ldap_filter(),
+ attrlist=[],
+ )
+ except ldap.NO_SUCH_OBJECT:
+ return
+
+ # FIXME : there is probably a more efficient way to do this
+ for dn, attrs in vals:
+ ldapdb.connection.delete_s(dn)
+