diff options
author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-11-26 13:50:43 -0500 |
---|---|---|
committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-11-26 13:50:43 -0500 |
commit | 99e51151244c7028fcc319d60e2e8ad1ba9e22bb (patch) | |
tree | 8cc96f6e50970fc3ef627a172b55583704693c94 /lib/sqlalchemy/orm/query.py | |
parent | 55ad1d9159089de46ef0981009307dff3e7ebac0 (diff) | |
download | sqlalchemy-99e51151244c7028fcc319d60e2e8ad1ba9e22bb.tar.gz |
- changelog, improve docstring/test for #3217. fixes #3217
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r-- | lib/sqlalchemy/orm/query.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py index 884e04bbc..790686288 100644 --- a/lib/sqlalchemy/orm/query.py +++ b/lib/sqlalchemy/orm/query.py @@ -1741,7 +1741,13 @@ class Query(object): and similar will adapt the incoming criterion to the target alias, until :meth:`~.Query.reset_joinpoint` is called. :param isouter=False: If True, the join used will be a left outer join, - just as if the ``outerjoin()`` method were called. + just as if the :meth:`.Query.outerjoin` method were called. This + flag is here to maintain consistency with the same flag as accepted + by :meth:`.FromClause.join` and other Core constructs. + + + .. versionadded:: 1.0.0 + :param from_joinpoint=False: When using ``aliased=True``, a setting of True here will cause the join to be from the most recent joined target, rather than starting back from the original |