summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-10-09 17:07:52 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-10-09 17:07:52 -0400
commit2ef7c5e49990311642d366806d4b43c0a7b90f6c (patch)
tree58dd6a326cb8da6ddf184a2afc5d02c7fd68dc4e
parent845500280d58a7c0cf6f08fb884b1428adb85635 (diff)
parentfebe0c0faae68d33ae473aa59a8efa56127885b7 (diff)
downloadsqlalchemy-2ef7c5e49990311642d366806d4b43c0a7b90f6c.tar.gz
Merge remote-tracking branch 'origin/pr/205'
-rw-r--r--lib/sqlalchemy/orm/query.py12
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 0af22b229..43cb198ea 100644
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -2464,6 +2464,12 @@ class Query(object):
Calling ``first()`` results in an execution of the underlying query.
+ .. seealso::
+
+ :meth:`.Query.one`
+
+ :meth:`.Query.one_or_none`
+
"""
if self._statement is not None:
ret = list(self)[0:1]
@@ -2496,6 +2502,12 @@ class Query(object):
Added :meth:`.Query.one_or_none`
+ .. seealso::
+
+ :meth:`.Query.first`
+
+ :meth:`.Query.one`
+
"""
ret = list(self)