From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 4 Jan 2008 01:00:42 +0000 (+0000)
Subject: add anonymous labels to function calls
X-Git-Tag: rel_0_4_2a~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e69e26924facebcad8b87eeebdcdde71851bf00;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

add anonymous labels to function calls
---

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 9e8b0f4880..35a12efe39 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -463,7 +463,7 @@ class DefaultCompiler(engine.Compiled):
             column.table is not None and \
             not isinstance(column.table, sql.Select):
             return column.label(column.name)
-        elif not isinstance(column, (sql._UnaryExpression, sql._TextClause)) and not hasattr(column, 'name'):
+        elif not isinstance(column, (sql._UnaryExpression, sql._TextClause)) and (not hasattr(column, 'name') or isinstance(column, sql._Function)):
             return column.label(None)
         else:
             return column