From 8a20d277c52bae6863512c90c64fba2e451950e3 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Fri, 26 Feb 2016 11:27:12 -0500 Subject: [PATCH] - unfortunately calling upon "_label" here makes it unclear if we're trying to hit columns without names yet and such, to suit the bug right now just make it specific to FunctionElement (cherry picked from commit 785224a92f39bd5bdd05bbc66f4dd79736abded5) --- lib/sqlalchemy/sql/elements.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py index 67a442b0c2..8256900f96 100644 --- a/lib/sqlalchemy/sql/elements.py +++ b/lib/sqlalchemy/sql/elements.py @@ -4005,8 +4005,10 @@ def _cloned_difference(a, b): if not all_overlap.intersection(elem._cloned_set)) -def _labeled(element): - if not hasattr(element, 'name') or not getattr(element, '_label', None): +@util.dependencies("sqlalchemy.sql.functions") +def _labeled(functions, element): + if not hasattr(element, 'name') or \ + isinstance(element, functions.FunctionElement): return element.label(None) else: return element -- 2.47.2