From af3c8a75c8e9eba593f6568187226548f1b8735d Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 15 Oct 2012 18:13:33 -0400 Subject: - allow a __clause_element__() to be passed to query.filter() also --- lib/sqlalchemy/orm/query.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index ca38d726c..35d32651f 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1187,14 +1187,7 @@ class Query(object): """ for criterion in list(criterion): - if isinstance(criterion, basestring): - criterion = sql.text(criterion) - - if criterion is not None and \ - not isinstance(criterion, sql.ClauseElement): - raise sa_exc.ArgumentError( - "filter() argument must be of type " - "sqlalchemy.sql.ClauseElement or string") + criterion = expression._literal_as_text(criterion) criterion = self._adapt_clause(criterion, True, True) -- cgit v1.2.1