From 700b3a52952529b50f5882657ef2aa9d7c2494b2 Mon Sep 17 00:00:00 2001 From: Ants Aasma Date: Wed, 30 Dec 2009 15:51:03 +0000 Subject: [PATCH] fix error reporting in evaluator for unknown clauselist operators. --- lib/sqlalchemy/orm/evaluator.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/orm/evaluator.py b/lib/sqlalchemy/orm/evaluator.py index 05af5d8ca7..3ee70782d6 100644 --- a/lib/sqlalchemy/orm/evaluator.py +++ b/lib/sqlalchemy/orm/evaluator.py @@ -54,7 +54,7 @@ class EvaluatorCompiler(object): if has_null: return None return False - if clause.operator is operators.and_: + elif clause.operator is operators.and_: def evaluate(obj): for sub_evaluate in evaluators: value = sub_evaluate(obj) @@ -63,6 +63,8 @@ class EvaluatorCompiler(object): return None return False return True + else: + raise UnevaluatableError("Cannot evaluate clauselist with operator %s" % clause.operator) return evaluate -- 2.47.3