summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-03-25 11:34:19 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-03-25 11:34:19 -0400
commit478185d05df86c73ad212a11732eb5374c8637a1 (patch)
tree16eb78dd2fba721a78a8450af1f88af19ea7dd7e /lib/sqlalchemy/orm/query.py
parent050dee534b888a9a8e6768d2ad16c3f2380c7c9c (diff)
downloadsqlalchemy-478185d05df86c73ad212a11732eb5374c8637a1.tar.gz
Correct ambiguous func / class links
:func:`.sql.expression.select`, :func:`.sql.expression.insert` and :class:`.sql.expression.Insert` were hitting many ambiguous symbol errors, due to future.select, as well as the PG/MySQL variants of Insert. Change-Id: Iac862bfc172a7f7f0cbba5353a83dc203bed376c
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 617bba315..3d40339b4 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -548,7 +548,7 @@ class Query(Generative):
to all columns.
:param reduce_columns: if True, :meth:`.Select.reduce_columns` will
- be called on the resulting :func:`.select` construct,
+ be called on the resulting :func:`~.sql.expression.select` construct,
to remove same-named columns where one also refers to the other
via foreign key or WHERE clause equivalence.
@@ -2032,9 +2032,9 @@ class Query(Generative):
There is a lot of flexibility in what the "target" can be when using
:meth:`~.Query.join`. As noted previously, it also accepts
- :class:`.Table` constructs and other selectables such as
- :func:`.alias` and :func:`.select` constructs, with either the one
- or two-argument forms::
+ :class:`.Table` constructs and other selectables such as :func:`.alias`
+ and :func:`~.sql.expression.select` constructs, with either the one or
+ two-argument forms::
addresses_q = select([Address.user_id]).\
where(Address.email_address.endswith("@bar.com")).\