summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-02-11 21:10:55 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-02-11 21:10:55 -0500
commitce9d61be9b76b93809263d43d679279bd2efd2ec (patch)
treebb6c014b563f4165f64fa4bbea5c29e5c4ee9777 /lib/sqlalchemy
parentb6b147c5ec689b78e54f0ae80ec14a9f05c3d9a8 (diff)
downloadsqlalchemy-ce9d61be9b76b93809263d43d679279bd2efd2ec.tar.gz
see also for session commit, rollback
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/session.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 27c84cc4e..00c6d4227 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -655,6 +655,10 @@ class Session(_SessionClassMethods):
to the first real transaction are closed. Subtransactions occur when
begin() is called multiple times.
+ .. seealso::
+
+ :ref:`session_rollback`
+
"""
if self.transaction is None:
pass
@@ -678,11 +682,16 @@ class Session(_SessionClassMethods):
multiple times), the subtransaction will be closed, and the next call
to ``commit()`` will operate on the enclosing transaction.
- For a session configured with autocommit=False, a new transaction will
+ When using the :class:`.Session` in its default mode of
+ ``autocommit=False``, a new transaction will
be begun immediately after the commit, but note that the newly begun
transaction does *not* use any connection resources until the first
SQL is actually emitted.
+ .. seealso::
+
+ :ref:`session_committing`
+
"""
if self.transaction is None:
if not self.autocommit: