from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
-from django.db.models.sql import BaseQuery
+from django.db.models.sql import Query as BaseQuery
from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
import ldapdb
if isinstance(item, WhereNode):
bits.append(item.as_sql())
continue
- table, column, type, x, y, values = item
+ if len(item) == 4:
+ # django 1.1
+ (table, column, type), x, y, values = item
+ else:
+ # django 1.0
+ table, column, type, x, y, values = item
if self.negated:
bits.append('(!(%s=%s))' % (column,values[0]))
else:
class Query(BaseQuery):
def results_iter(self):
# FIXME: use all object classes
- filterstr = '(objectClass=%s)' % self.model._meta.object_classes[0]
+ 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 ]
try:
vals = ldapdb.connection.search_s(
- self.model._meta.dn,
+ self.model.base_dn,
ldap.SCOPE_SUBTREE,
filterstr=filterstr,
attrlist=attrlist,
# process results
for dn, attrs in vals:
- row = [dn]
+ row = []
for field in iter(self.model._meta.fields):
- row.append(attrs.get(field.db_column, None))
+ if field.attname == 'dn':
+ row.append(dn)
+ else:
+ row.append(attrs.get(field.db_column, None))
yield row
class QuerySet(BaseQuerySet):