- allow a __clause_element__() to be passed to query.filter() also

1 files changed, 1 insertions, 8 deletions

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)