summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/elements.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2016-02-26 11:27:12 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2016-02-26 11:27:49 -0500
commit8a20d277c52bae6863512c90c64fba2e451950e3 (patch)
tree21c35466c9a3de0740e1972906dea0b43206b837 /lib/sqlalchemy/sql/elements.py
parent0210695bd97e76f58d8781b69337816501482fb0 (diff)
downloadsqlalchemy-8a20d277c52bae6863512c90c64fba2e451950e3.tar.gz
- 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)
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
-rw-r--r--lib/sqlalchemy/sql/elements.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index 67a442b0c..8256900f9 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