X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=3076e3f3364905bf2a272be6ad31934641cde093;hp=e43be2d19dcf92bc0099500d3b3d1bbf496fe639;hb=ccd4564cbcef786f10930f67f8f827e29725777f;hpb=e16c6c60b2366e633b0b23806943fb344c2596d5 diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index e43be2d..3076e3f 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, IntegerField, ListField +from ldapdb.models.fields import CharField def get_lookup_operator(lookup_type): if lookup_type == 'gte': @@ -63,6 +63,80 @@ class Constraint(BaseConstraint): return (self.alias, self.col, db_type), params +class Compiler(object): + def __init__(self, query, connection, using): + self.query = query + self.connection = connection + self.using = using + + def results_iter(self): + if self.query.select_fields: + fields = self.query.select_fields + else: + fields = self.query.model._meta.fields + + attrlist = [ x.db_column for x in fields if x.db_column ] + + try: + vals = self.connection.search_s( + self.query.model.base_dn, + ldap.SCOPE_SUBTREE, + filterstr=self.query._ldap_filter(), + attrlist=attrlist, + ) + except ldap.NO_SUCH_OBJECT: + return + + # perform sorting + if self.query.extra_order_by: + ordering = self.query.extra_order_by + elif not self.query.default_ordering: + ordering = self.query.order_by + else: + ordering = self.query.order_by or self.query.model._meta.ordering + def cmpvals(x, y): + for fieldname in ordering: + if fieldname.startswith('-'): + fieldname = fieldname[1:] + negate = True + else: + negate = False + 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 + if hasattr(attr_x, 'lower'): + attr_x = attr_x.lower() + if hasattr(attr_y, 'lower'): + attr_y = attr_y.lower() + val = negate and cmp(attr_y, attr_x) or cmp(attr_x, attr_y) + if val: + return val + return 0 + vals = sorted(vals, cmp=cmpvals) + + # process results + pos = 0 + 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 = [] + for field in iter(fields): + if field.attname == 'dn': + row.append(dn) + elif hasattr(field, 'from_ldap'): + row.append(field.from_ldap(attrs.get(field.db_column, []), connection=self.connection)) + else: + row.append(None) + yield row + pos += 1 + + class WhereNode(BaseWhereNode): def add(self, data, connector): if not isinstance(data, (list, tuple)): @@ -121,77 +195,38 @@ class Query(BaseQuery): super(Query, self).__init__(*args, **kwargs) self.connection = ldapdb.connection - def get_count(self): + 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 = '(&%s)' % filterstr + return '(&%s)' % filterstr + def get_count(self, using=None): try: vals = ldapdb.connection.search_s( self.model.base_dn, ldap.SCOPE_SUBTREE, - filterstr=filterstr, + filterstr=self._ldap_filter(), attrlist=[], ) - except: - raise self.model.DoesNotExist + except ldap.NO_SUCH_OBJECT: + return 0 - return len(vals) + number = len(vals) - def results_iter(self): - filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes]) - sql, params = self.where.as_sql() - filterstr += sql - filterstr = '(&%s)' % filterstr - attrlist = [ x.db_column for x in self.model._meta.local_fields if x.db_column ] + # 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) - try: - vals = ldapdb.connection.search_s( - self.model.base_dn, - ldap.SCOPE_SUBTREE, - filterstr=filterstr, - attrlist=attrlist, - ) - except: - raise self.model.DoesNotExist + return number - # perform sorting - if self.extra_order_by: - ordering = self.extra_order_by - elif not self.default_ordering: - ordering = self.order_by - else: - ordering = self.order_by or self.model._meta.ordering - def cmpvals(x, y): - for field in ordering: - if field.startswith('-'): - field = field[1:] - negate = True - else: - negate = False - attr = self.model._meta.get_field(field).db_column - attr_x = x[1].get(attr, '').lower() - attr_y = y[1].get(attr, '').lower() - val = negate and cmp(attr_y, attr_x) or cmp(attr_x, attr_y) - if val: - return val - return 0 - vals = sorted(vals, cmp=cmpvals) + def get_compiler(self, using=None, connection=None): + return Compiler(self, ldapdb.connection, using) - # process results - for dn, attrs in vals: - row = [] - 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, [''])[0]) - yield row + def results_iter(self): + "For django 1.1 compatibility" + return self.get_compiler().results_iter() class QuerySet(BaseQuerySet): def __init__(self, model=None, query=None, using=None): @@ -206,3 +241,19 @@ class QuerySet(BaseQuerySet): 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) +