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: