summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/expression.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-07-25 19:34:02 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-07-25 19:34:02 +0000
commit4d036d6dd4a6dde9e7ae18ebc6451fdf8da0c726 (patch)
tree3ba800230bc7f1ff23644fa45166151aff9aa41e /lib/sqlalchemy/sql/expression.py
parent1e6df0eeb7845e85e98ce334474e4c9ab8c10611 (diff)
downloadsqlalchemy-4d036d6dd4a6dde9e7ae18ebc6451fdf8da0c726.tar.gz
- Unary expressions such as DISTINCT propagate their
type handling to result sets, allowing conversions like unicode and such to take place. [ticket:1420]
Diffstat (limited to 'lib/sqlalchemy/sql/expression.py')
-rw-r--r--lib/sqlalchemy/sql/expression.py7
1 files changed, 3 insertions, 4 deletions
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 <columnname>``"""
-
- 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. ``<column> BETWEEN <cleft> AND <cright>``"""