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
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 __init__(self, *args, **kwargs):
+ super(Query, self).__init__(*args, **kwargs)
+ self.connection = ldapdb.connection
+
+ def get_count(self):
+ filterstr = ''.join(['(objectClass=%s)' % cls for cls in self.model.object_classes])
+ sql, params = self.where.as_sql()
+ filterstr += sql
+ filterstr = '(&%s)' % filterstr
+
+ try:
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=filterstr,
+ attrlist=[],
+ )
+ except:
+ raise self.model.DoesNotExist
+
+ return len(vals)
+
def results_iter(self):
- # FIXME: use all object classes
- filterstr = '(objectClass=%s)' % self.model.object_classes[0]
- filterstr += self.where.as_sql()
+ 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 ]
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))
+ 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)
# process results
for dn, attrs in vals:
def __init__(self, model=None, query=None, using=None):
if not query:
import inspect
- spec = inspect.getargspec(Query.__init__)
+ 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, query)
+ super(QuerySet, self).__init__(model=model, query=query)