summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-01-24 17:36:49 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2017-01-24 17:36:49 -0500
commit0d91796bb3869654e104fdfd9bf5f465e2e1b0ec (patch)
tree983592c816065eb97c58d1ea014b1ac4f4b63f02 /lib/sqlalchemy
parent6e83259e7ff90297c504d58db004a4e3228d6845 (diff)
parent8795472c875d5f424f96a1e19e93d6dd4a7df6a8 (diff)
downloadsqlalchemy-0d91796bb3869654e104fdfd9bf5f465e2e1b0ec.tar.gz
Merge branch 'doc_typo' of https://bitbucket.org/fredj/sqlalchemy
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/util.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index b4d5b8a9e..019f32b26 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -636,7 +636,7 @@ def aliased(element, alias=None, name=None, flat=False, adapt_on_names=False):
Above, functions on ``aggregated_unit_price`` which refer to
``.price`` will return the
- ``fund.sum(UnitPrice.price).label('price')`` column, as it is
+ ``func.sum(UnitPrice.price).label('price')`` column, as it is
matched on the name "price". Ordinarily, the "price" function
wouldn't have any "column correspondence" to the actual
``UnitPrice.price`` column as it is not a proxy of the original.