From 4d036d6dd4a6dde9e7ae18ebc6451fdf8da0c726 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 25 Jul 2009 19:34:02 +0000 Subject: - Unary expressions such as DISTINCT propagate their type handling to result sets, allowing conversions like unicode and such to take place. [ticket:1420] --- lib/sqlalchemy/sql/expression.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/sqlalchemy/sql/expression.py') diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index b5eb0eee9..0dae6716d 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -400,8 +400,8 @@ def not_(clause): def distinct(expr): """Return a ``DISTINCT`` clause.""" - - return _UnaryExpression(expr, operator=operators.distinct_op) + expr = _literal_as_binds(expr) + return _UnaryExpression(expr, operator=operators.distinct_op, type_=expr.type) def between(ctest, cleft, cright): """Return a ``BETWEEN`` predicate clause. @@ -1476,8 +1476,7 @@ class _CompareMixin(ColumnOperators): def distinct(self): """Produce a DISTINCT clause, i.e. ``DISTINCT ``""" - - return _UnaryExpression(self, operator=operators.distinct_op) + return _UnaryExpression(self, operator=operators.distinct_op, type_=self.type) def between(self, cleft, cright): """Produce a BETWEEN clause, i.e. `` BETWEEN AND ``""" -- cgit v1.2.1