diff options
Diffstat (limited to 'doc/build/orm/session.rst')
| -rw-r--r-- | doc/build/orm/session.rst | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/doc/build/orm/session.rst b/doc/build/orm/session.rst index 31157e0f7..a995c87a3 100644 --- a/doc/build/orm/session.rst +++ b/doc/build/orm/session.rst @@ -1278,14 +1278,6 @@ nested begin/commit-or-rollback pairs where only the outermost begin/commit pair actually commits the transaction, or if the outermost block rolls back, everything is rolled back. -The :class:`.Session` object and :func:`.sessionmaker` function -================================================================ - -.. autofunction:: sessionmaker - -.. autoclass:: sqlalchemy.orm.session.Session - :members: - .. _unitofwork_contextual: Contextual/Thread-local Sessions @@ -1404,8 +1396,8 @@ its connections to the pool and removes any existing transactional context. Doing nothing is an option too, if individual controller methods take responsibility for ensuring that no transactions remain open after a request ends. -Contextual Session API ------------------------ +API Documentation - Contextual Session +-------------------------------------- .. autofunction:: sqlalchemy.orm.scoped_session @@ -1446,15 +1438,26 @@ tables) across multiple databases. See the "sharding" example: :ref:`examples_sharding`. -Session Utilities -================= +API Documentation - Sessions +============================ + +Session and sessionmaker() +--------------------------- + +.. autofunction:: sessionmaker + +.. autoclass:: sqlalchemy.orm.session.Session + :members: + +Session Utilites +---------------- .. autofunction:: make_transient .. autofunction:: object_session Attribute and State Management Utilities -======================================== +----------------------------------------- These functions are provided by the SQLAlchemy attribute instrumentation API to provide a detailed interface for dealing @@ -1476,13 +1479,13 @@ those described in :ref:`events_orm_toplevel`. .. function:: instance_state - Return the :class:`InstanceState` for a given object. + Return the :class:`.InstanceState` for a given object. .. autofunction:: is_instrumented .. function:: manager_of_class - Return the :class:`ClassManager` for a given class. + Return the :class:`.ClassManager` for a given class. .. autofunction:: set_attribute |