X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fdjango-ldapdb.git;a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=e84748c4ee00a35475d34e913e4824ed70a88cbe;hp=91a3f62e2058bf8587342559c04ffefee3c58487;hb=8174a9ef106740eb32151e47dad21a999f70b595;hpb=5c3683a37e2afc87654d4b44c3f8e9fbe7872076 diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index 91a3f62..e84748c 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -35,23 +35,15 @@ from copy import deepcopy import ldap +from django.db import connections from django.db.models.query import QuerySet as BaseQuerySet from django.db.models.query_utils import Q -from django.db.models.sql import Query as BaseQuery +from django.db.models.sql import Query from django.db.models.sql.where import WhereNode as BaseWhereNode, Constraint as BaseConstraint, AND, OR -import ldapdb - +from ldapdb.backends.ldap import compiler from ldapdb.models.fields import CharField -def get_lookup_operator(lookup_type): - if lookup_type == 'gte': - return '>=' - elif lookup_type == 'lte': - return '<=' - else: - return '=' - class Constraint(BaseConstraint): """ An object that can be passed to WhereNode.add() and knows how to @@ -60,9 +52,8 @@ class Constraint(BaseConstraint): NOTES: - we redefine this class, because when self.field is None calls Field().get_db_prep_lookup(), which short-circuits our LDAP-specific code. - - the connection argument defaults to None for django 1.1 compatibility """ - def process(self, lookup_type, value, connection=None): + def process(self, lookup_type, value, connection): """ Returns a tuple of data suitable for inclusion in a WhereNode instance. @@ -84,80 +75,6 @@ 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, - self.query.model.search_scope, - 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)): @@ -170,119 +87,9 @@ class WhereNode(BaseWhereNode): obj = Constraint(obj.alias, obj.col, obj.field) super(WhereNode, self).add((obj, lookup_type, value), connector) - def as_sql(self, qn=None, connection=None): - bits = [] - for item in self.children: - 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 - 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 - equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ] - if len(equal_bits) == 1: - clause = equal_bits[0] - else: - clause = '(|%s)' % ''.join(equal_bits) - - bits.append(clause) - - if not len(bits): - return '', [] - - if len(bits) == 1: - sql_string = bits[0] - elif self.connector == AND: - sql_string = '(&%s)' % ''.join(bits) - elif self.connector == OR: - sql_string = '(|%s)' % ''.join(bits) - else: - raise Exception("Unhandled WHERE connector: %s" % self.connector) - - if self.negated: - sql_string = ('(!%s)' % sql_string) - - return sql_string, [] - -class Query(BaseQuery): - 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, - self.model.search_scope, - filterstr=self._ldap_filter(), - attrlist=[], - ) - 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 number - - def get_compiler(self, using=None, connection=None): - return Compiler(self, ldapdb.connection, using) - - def has_results(self, using): - return self.get_count() != 0 - - 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): if not 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, - self.model.search_scope, - 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) + query = Query(model, WhereNode) + super(QuerySet, self).__init__(model=model, query=query, using=using)