summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/query.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-09-24 13:52:25 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-09-24 13:52:25 -0400
commit5b71858533ea153dec119b3592631fdb1500a15f (patch)
treed5376860fcee397655effca10bda2853510ddc55 /lib/sqlalchemy/orm/query.py
parenta9b5fb3f497837c0a4f1122c49c5dd54c87474a0 (diff)
downloadsqlalchemy-5b71858533ea153dec119b3592631fdb1500a15f.tar.gz
- replicate Query.one_or_none to BakedQuery
- changelog / version note finishing
Diffstat (limited to 'lib/sqlalchemy/orm/query.py')
-rw-r--r--lib/sqlalchemy/orm/query.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 8c4925905..f0b8969a2 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2491,8 +2491,10 @@ class Query(object):
Calling ``one_or_none()`` results in an execution of the underlying
query.
- .. versionchanged:: 1.0.9
- Added ``one_or_none()``
+ .. versionadded:: 1.0.9
+
+ Added :meth:`.Query.one_or_none`
+
"""
ret = list(self)
@@ -2526,6 +2528,12 @@ class Query(object):
any kind of limit, so that the "unique"-ing of entities does not
conceal multiple object identities.
+ .. seealso::
+
+ :meth:`.Query.first`
+
+ :meth:`.Query.one_or_none`
+
"""
ret = list(self)