import ldapdb
-from ldapdb.models.fields import CharField
+from ldapdb.models.fields import CharField, IntegerField, ListField
def get_lookup_operator(lookup_type):
if lookup_type == 'gte':
obj = Constraint(obj.alias, obj.col, obj.field)
super(WhereNode, self).add((obj, lookup_type, value), connector)
- def as_sql(self, qn=None):
+ def as_sql(self, qn=None, connection=None):
bits = []
for item in self.children:
- if isinstance(item, WhereNode):
- sql, params = item.as_sql()
+ if hasattr(item, 'as_sql'):
+ sql, params = item.as_sql(qn=qn, connection=connection)
bits.append(sql)
continue
for field in iter(self.model._meta.fields):
if field.attname == 'dn':
row.append(dn)
+ elif isinstance(field, IntegerField):
+ row.append(int(attrs.get(field.db_column, [0])[0]))
+ elif isinstance(field, ListField):
+ row.append(attrs.get(field.db_column, []))
else:
- row.append(attrs.get(field.db_column, None))
+ row.append(attrs.get(field.db_column, [''])[0])
yield row
class QuerySet(BaseQuerySet):