From 583902bc6785fbb92c5c5de6c7d47f71c2556021 Mon Sep 17 00:00:00 2001 From: Ants Aasma Date: Mon, 6 Aug 2007 19:12:31 +0000 Subject: [PATCH] clean up some dead code in Query.filter_by --- lib/sqlalchemy/orm/query.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index bf16cb6991..08ae760fc2 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -302,26 +302,12 @@ class Query(object): #import properties - alias = None - join = None - clause = None joinpoint = self._joinpoint - for key, value in kwargs.iteritems(): - prop = joinpoint.get_property(key, resolve_synonyms=True) - c = prop.compare(operator.eq, value) - - if alias is not None: - sql_util.ClauseAdapter(alias).traverse(c) - if clause is None: - clause = c - else: - clause &= c + clauses = [joinpoint.get_property(key, resolve_synonyms=True).compare(operator.eq, value) + for key, value in kwargs.iteritems()] - if join is not None: - return self.select_from(join).filter(clause) - else: - return self.filter(clause) + return self.filter(sql.and_(*clauses)) def _join_to(self, keys, outerjoin=False, start=None, create_aliases=True): if start is None: -- 2.47.3