# -*- 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
import ldapdb
-from ldapdb import escape_ldap_filter
+from ldapdb.models.fields import CharField
+
+def get_lookup_operator(lookup_type):
+ if lookup_type == 'gte':
+ return '>='
+ elif lookup_type == 'lte':
+ return '<='
+ else:
+ return '='
class Constraint(BaseConstraint):
"""
# Because of circular imports, we need to import this here.
from django.db.models.base import ObjectDoesNotExist
- if lookup_type == 'endswith':
- params = ["*%s" % escape_ldap_filter(value)]
- elif lookup_type == 'startswith':
- params = ["%s*" % escape_ldap_filter(value)]
- elif lookup_type == 'contains':
- params = ["*%s*" % escape_ldap_filter(value)]
- elif lookup_type == 'exact':
- params = [escape_ldap_filter(value)]
- elif lookup_type == 'in':
- params = [escape_ldap_filter(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
- constraint, x, y, values = item
+ constraint, lookup_type, y, values = item
+ comp = get_lookup_operator(lookup_type)
if hasattr(constraint, "col"):
# django 1.2
- clause = "(%s=%s)" % (constraint.col, values)
+ clause = "(%s%s%s)" % (constraint.col, comp, values)
else:
# django 1.1
- (table, column, type) = constraint
- equal_bits = [ "(%s=%s)" % (column, value) for value in values ]
+ (table, column, db_type) = constraint
+ equal_bits = [ "(%s%s%s)" % (column, comp, value) for value in values ]
if len(equal_bits) == 1:
clause = equal_bits[0]
else: