# -*- coding: utf-8 -*-
#
# django-ldapdb
-# Copyright (C) 2009 Bolloré telecom
+# Copyright (C) 2009-2010 Bolloré telecom
# See AUTHORS file for a full list of contributors.
#
# This program is free software: you can redistribute it and/or modify
from copy import deepcopy
import ldap
-from django.db.models.fields import Field
from django.db.models.query import QuerySet as BaseQuerySet
from django.db.models.query_utils import Q
from django.db.models.sql import Query as BaseQuery
import ldapdb
+from ldapdb.models.fields import CharField
+
class Constraint(BaseConstraint):
"""
An object that can be passed to WhereNode.add() and knows how to
# Because of circular imports, we need to import this here.
from django.db.models.base import ObjectDoesNotExist
- if lookup_type == 'endswith':
- params = ["*%s" % value]
- elif lookup_type == 'startswith':
- params = ["%s*" % value]
- elif lookup_type == 'exact':
- params = [value]
- elif lookup_type == 'in':
- params = [v for v in value]
- else:
- raise TypeError("Field has invalid lookup: %s" % lookup_type)
-
try:
if self.field:
+ params = self.field.get_db_prep_lookup(lookup_type, value)
db_type = self.field.db_type()
else:
+ params = CharField().get_db_prep_lookup(lookup_type, value)
db_type = None
except ObjectDoesNotExist:
raise EmptyShortCircuit
if isinstance(item, WhereNode):
bits.append(item.as_sql())
continue
- if len(item) == 4:
- # django 1.1
- (table, column, type), x, y, values = item
+ constraint, x, y, values = item
+ if hasattr(constraint, "col"):
+ # django 1.2
+ clause = "(%s=%s)" % (constraint.col, values)
else:
- # django 1.0
- table, column, type, x, y, values = item
- equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
- if len(equal_bits) == 1:
- clause = equal_bits[0]
- else:
- clause = '(|%s)' % ''.join(equal_bits)
+ # django 1.1
+ (table, column, type) = constraint
+ equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
+ if len(equal_bits) == 1:
+ clause = equal_bits[0]
+ else:
+ clause = '(|%s)' % ''.join(equal_bits)
if self.negated:
bits.append('(!%s)' % clause)
else: