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
rework passing of dn
[matthijs/upstream/django-ldapdb.git]
/
ldapdb
/
models
/
query.py
diff --git
a/ldapdb/models/query.py
b/ldapdb/models/query.py
index 7346608505d888c759e0ace78beb0f8734cc612f..b53d9591d73c54a2a187d92cc74b0fc5949c2c97 100644
(file)
--- a/
ldapdb/models/query.py
+++ b/
ldapdb/models/query.py
@@
-25,7
+25,7
@@
import ldap
from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
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
from django.db.models.sql.where import WhereNode as BaseWhereNode, AND, OR
import ldapdb
@@
-37,7
+37,12
@@
class WhereNode(BaseWhereNode):
if isinstance(item, WhereNode):
bits.append(item.as_sql())
continue
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:
if self.negated:
bits.append('(!(%s=%s))' % (column,values[0]))
else:
@@
-86,9
+91,12
@@
class Query(BaseQuery):
# process results
for dn, attrs in vals:
# process results
for dn, attrs in vals:
- row = [
dn
]
+ row = []
for field in iter(self.model._meta.fields):
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):
yield row
class QuerySet(BaseQuerySet):