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=b8e4897a645e1132424c1b735aff28928235408d;hb=ccd4564cbcef786f10930f67f8f827e29725777f;hpb=15ab751beb0021ef73455d55b96eddbf01bcfffb diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index b8e4897..3076e3f 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -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)): @@ -75,17 +149,24 @@ class WhereNode(BaseWhereNode): obj = Constraint(obj.alias, obj.col, obj.field) super(WhereNode, self).add((obj, lookup_type, value), connector) - def as_sql(self): + def as_sql(self, qn=None, connection=None): bits = [] for item in self.children: - if isinstance(item, WhereNode): - bits.append(item.as_sql()) + if hasattr(item, 'as_sql'): + sql, params = item.as_sql(qn=qn, connection=connection) + bits.append(sql) continue + constraint, lookup_type, y, values = item comp = get_lookup_operator(lookup_type) if hasattr(constraint, "col"): # django 1.2 - clause = "(%s%s%s)" % (constraint.col, comp, values) + column = constraint.col + if lookup_type == 'in': + equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ] + clause = '(|%s)' % ''.join(equal_bits) + else: + clause = "(%s%s%s)" % (constraint.col, comp, values) else: # django 1.1 (table, column, db_type) = constraint @@ -94,65 +175,85 @@ class WhereNode(BaseWhereNode): clause = equal_bits[0] else: clause = '(|%s)' % ''.join(equal_bits) + if self.negated: bits.append('(!%s)' % clause) else: bits.append(clause) if len(bits) == 1: - return bits[0] + sql_string = bits[0] elif self.connector == AND: - return '(&%s)' % ''.join(bits) + sql_string = '(&%s)' % ''.join(bits) elif self.connector == OR: - return '(|%s)' % ''.join(bits) + sql_string = '(|%s)' % ''.join(bits) else: raise Exception("Unhandled WHERE connector: %s" % self.connector) + return sql_string, [] class Query(BaseQuery): - def results_iter(self): - # FIXME: use all object classes - filterstr = '(objectClass=%s)' % self.model.object_classes[0] - filterstr += self.where.as_sql() - filterstr = '(&%s)' % filterstr - attrlist = [ x.db_column for x in self.model._meta.local_fields if x.db_column ] + def __init__(self, *args, **kwargs): + super(Query, self).__init__(*args, **kwargs) + self.connection = ldapdb.connection + + def _ldap_filter(self): + filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes]) + sql, params = self.where.as_sql() + filterstr += sql + return '(&%s)' % filterstr + def get_count(self, using=None): try: vals = ldapdb.connection.search_s( self.model.base_dn, ldap.SCOPE_SUBTREE, - filterstr=filterstr, - attrlist=attrlist, + filterstr=self._ldap_filter(), + attrlist=[], ) - except: - raise self.model.DoesNotExist + except ldap.NO_SUCH_OBJECT: + return 0 - # 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 getkey(x): - keys = [] - for k in ordering: - attr = self.model._meta.get_field(k).db_column - keys.append(x[1].get(attr, '').lower()) - return keys - vals = sorted(vals, key=lambda x: getkey(x)) + number = len(vals) - # process results - for dn, attrs in vals: - row = [] - for field in iter(self.model._meta.fields): - if field.attname == 'dn': - row.append(dn) - else: - row.append(attrs.get(field.db_column, None)) - yield row + # 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 number + + def get_compiler(self, using=None, connection=None): + return Compiler(self, ldapdb.connection, using) + + 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): + def __init__(self, model=None, query=None, using=None): if not query: - query = Query(model, None, WhereNode) - super(QuerySet, self).__init__(model, query) + import inspect + spec = inspect.getargspec(BaseQuery.__init__) + if len(spec[0]) == 3: + # django 1.2 + query = Query(model, WhereNode) + else: + # django 1.1 + 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)