summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-03-05 12:39:07 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2019-03-05 12:39:07 -0500
commit62bc03c51ba60c11772b751670aeab02bacd32fd (patch)
tree788333a9732ec981fdc0b41759b315621c12dd16 /lib/sqlalchemy
parent5c4b556c7ae21c82e86cf7b11343cacb4c43cb4a (diff)
parent4f62c23cf3ce667376ceb6b0a50240c4f1c19220 (diff)
downloadsqlalchemy-62bc03c51ba60c11772b751670aeab02bacd32fd.tar.gz
Merge remote-tracking branch 'origin/pr/4520'
Change-Id: I3ca8e33c361ea088323e83437d6817ba02737de7
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/ext/hybrid.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index 556514bab..61bd656fb 100644
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -509,7 +509,7 @@ reference the instrumented attribute back to the hybrid object::
last_name = Column(String)
- @FirstNameOnly.overrides.expression
+ @FirstNameOnly.name.overrides.expression
def name(cls):
return func.concat(cls.first_name, ' ', cls.last_name)