diff options
author | mike bayer <mike_mp@zzzcomputing.com> | 2020-03-25 17:28:29 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2020-03-25 17:28:29 +0000 |
commit | 25b44105269ee38778464c28e5869a742f9cc407 (patch) | |
tree | 0b615966502d5667c7b99a57862b14e9ee290e6d /lib/sqlalchemy/orm/query.py | |
parent | 89d34a99e2d4f6434397fc274d5980830a53f950 (diff) | |
parent | 478185d05df86c73ad212a11732eb5374c8637a1 (diff) | |
download | sqlalchemy-25b44105269ee38778464c28e5869a742f9cc407.tar.gz |
Merge "Correct ambiguous func / class links"
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r-- | lib/sqlalchemy/orm/query.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 24d8975e4..de11ba7dc 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")).\ |