def results_iter(self):
query = self.query
-
- 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 ]
- try:
- vals = self.connection.search_s(
- query.model.base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=filterstr,
- attrlist=attrlist,
- )
- except:
- raise query.model.DoesNotExist
+ vals = self.connection.search_s(
+ query.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=query._ldap_filter(),
+ attrlist=attrlist,
+ )
# perform sorting
if query.extra_order_by:
else:
ordering = query.order_by or query.model._meta.ordering
def cmpvals(x, y):
- for field in ordering:
- if field.startswith('-'):
- field = field[1:]
+ for fieldname in ordering:
+ if fieldname.startswith('-'):
+ fieldname = fieldname[1:]
negate = True
else:
negate = False
- attr = query.model._meta.get_field(field).db_column
- attr_x = x[1].get(attr, '').lower()
- attr_y = y[1].get(attr, '').lower()
+ field = 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
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
-
- try:
- vals = self.connection.search_s(
- self.model.base_dn,
- ldap.SCOPE_SUBTREE,
- filterstr=filterstr,
- attrlist=[],
- )
- except:
- raise self.model.DoesNotExist
-
+ return '(&%s)' % filterstr
+
+ def get_count(self, using=None):
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=self._ldap_filter(),
+ attrlist=[],
+ )
return len(vals)
def get_compiler(self, using=None, connection=None):
query = Query(model, None, WhereNode)
super(QuerySet, self).__init__(model=model, query=query)
+ def delete(self):
+ "Bulk deletion."
+ vals = ldapdb.connection.search_s(
+ self.model.base_dn,
+ ldap.SCOPE_SUBTREE,
+ filterstr=self.query._ldap_filter(),
+ attrlist=[],
+ )
+ # FIXME : there is probably a more efficient way to do this
+ for dn, attrs in vals:
+ ldapdb.connection.delete_s(dn)
+