diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-08-21 17:38:23 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-08-21 17:38:23 -0400 |
| commit | 575c4ee5c644a6b0feb14272b4eb37702bf20645 (patch) | |
| tree | c5dbf215a866902a51f4a6fadb48e76cd388d360 | |
| parent | b4af17b342162f54ae097eb13d52185e24be196c (diff) | |
| parent | 42a65014f8cf39d29ca9e411e511b613a3ffa446 (diff) | |
| download | sqlalchemy-575c4ee5c644a6b0feb14272b4eb37702bf20645.tar.gz | |
Merge remote-tracking branch 'origin/pr/131'
| -rw-r--r-- | doc/build/orm/session.rst | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst index b47e70d53..78ae1ba81 100644 --- a/doc/build/orm/session.rst +++ b/doc/build/orm/session.rst @@ -1773,7 +1773,10 @@ method:: of times, which will issue a new SAVEPOINT with a unique identifier for each call. For each :meth:`~.Session.begin_nested` call, a corresponding :meth:`~.Session.rollback` or -:meth:`~.Session.commit` must be issued. +:meth:`~.Session.commit` must be issued. (But note that if the return value is +used as a context manager, i.e. in a with-statement, then this rollback/commit +is issued by the context manager upon exiting the context, and so should not be +added explicitly.) When :meth:`~.Session.begin_nested` is called, a :meth:`~.Session.flush` is unconditionally issued |