projects
/
matthijs
/
upstream
/
django-ldapdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some tests for different field types
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index f5c402040f8826ce05a38d5947c30998bbc9591e..55576a6b4be1c44cb8427e49aff7c3eb29e4b42a 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-28,7
+28,7
@@
from django.db.models.sql.where import WhereNode as BaseWhereNode, Constraint as
import ldapdb
import ldapdb
-from ldapdb.models.fields import CharField
+from ldapdb.models.fields import CharField
, Integer, ListField
def get_lookup_operator(lookup_type):
if lookup_type == 'gte':
def get_lookup_operator(lookup_type):
if lookup_type == 'gte':
@@
-75,11
+75,11
@@
class WhereNode(BaseWhereNode):
obj = Constraint(obj.alias, obj.col, obj.field)
super(WhereNode, self).add((obj, lookup_type, value), connector)
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:
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
bits.append(sql)
continue
@@
-185,8
+185,12
@@
class Query(BaseQuery):
for field in iter(self.model._meta.fields):
if field.attname == 'dn':
row.append(dn)
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:
else:
- row.append(attrs.get(field.db_column,
None)
)
+ row.append(attrs.get(field.db_column,
[''])[0]
)
yield row
class QuerySet(BaseQuerySet):
yield row
class QuerySet(BaseQuerySet):