X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=ldapdb%2Fmodels%2Fquery.py;h=91a3f62e2058bf8587342559c04ffefee3c58487;hb=5c3683a37e2afc87654d4b44c3f8e9fbe7872076;hp=3076e3f3364905bf2a272be6ad31934641cde093;hpb=ccd4564cbcef786f10930f67f8f827e29725777f;p=matthijs%2Fupstream%2Fdjango-ldapdb.git diff --git a/ldapdb/models/query.py b/ldapdb/models/query.py index 3076e3f..91a3f62 100644 --- a/ldapdb/models/query.py +++ b/ldapdb/models/query.py @@ -1,21 +1,35 @@ # -*- coding: utf-8 -*- # # django-ldapdb -# Copyright (C) 2009-2010 Bolloré telecom +# Copyright (c) 2009-2010, Bolloré telecom +# All rights reserved. +# # See AUTHORS file for a full list of contributors. # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# Redistribution and use in source and binary forms, with or without modification, +# are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# 3. Neither the name of Bolloré telecom nor the names of its contributors +# may be used to endorse or promote products derived from this software +# without specific prior written permission. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # from copy import deepcopy @@ -42,8 +56,13 @@ class Constraint(BaseConstraint): """ An object that can be passed to WhereNode.add() and knows how to pre-process itself prior to including in the WhereNode. + + NOTES: + - we redefine this class, because when self.field is None calls + Field().get_db_prep_lookup(), which short-circuits our LDAP-specific code. + - the connection argument defaults to None for django 1.1 compatibility """ - def process(self, lookup_type, value): + def process(self, lookup_type, value, connection=None): """ Returns a tuple of data suitable for inclusion in a WhereNode instance. @@ -53,10 +72,12 @@ class Constraint(BaseConstraint): try: if self.field: - params = self.field.get_db_prep_lookup(lookup_type, value) + params = self.field.get_db_prep_lookup(lookup_type, value, + connection=connection, prepared=True) db_type = self.field.db_type() else: - params = CharField().get_db_prep_lookup(lookup_type, value) + params = CharField().get_db_prep_lookup(lookup_type, value, + connection=connection, prepared=True) db_type = None except ObjectDoesNotExist: raise EmptyShortCircuit @@ -80,7 +101,7 @@ class Compiler(object): try: vals = self.connection.search_s( self.query.model.base_dn, - ldap.SCOPE_SUBTREE, + self.query.model.search_scope, filterstr=self.query._ldap_filter(), attrlist=attrlist, ) @@ -176,10 +197,11 @@ class WhereNode(BaseWhereNode): else: clause = '(|%s)' % ''.join(equal_bits) - if self.negated: - bits.append('(!%s)' % clause) - else: - bits.append(clause) + bits.append(clause) + + if not len(bits): + return '', [] + if len(bits) == 1: sql_string = bits[0] elif self.connector == AND: @@ -188,6 +210,10 @@ class WhereNode(BaseWhereNode): sql_string = '(|%s)' % ''.join(bits) else: raise Exception("Unhandled WHERE connector: %s" % self.connector) + + if self.negated: + sql_string = ('(!%s)' % sql_string) + return sql_string, [] class Query(BaseQuery): @@ -205,7 +231,7 @@ class Query(BaseQuery): try: vals = ldapdb.connection.search_s( self.model.base_dn, - ldap.SCOPE_SUBTREE, + self.model.search_scope, filterstr=self._ldap_filter(), attrlist=[], ) @@ -224,6 +250,9 @@ class Query(BaseQuery): def get_compiler(self, using=None, connection=None): return Compiler(self, ldapdb.connection, using) + def has_results(self, using): + return self.get_count() != 0 + def results_iter(self): "For django 1.1 compatibility" return self.get_compiler().results_iter() @@ -246,7 +275,7 @@ class QuerySet(BaseQuerySet): try: vals = ldapdb.connection.search_s( self.model.base_dn, - ldap.SCOPE_SUBTREE, + self.model.search_scope, filterstr=self.query._ldap_filter(), attrlist=[], )