diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-04-26 10:59:34 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-01 22:37:59 -0400 |
| commit | f247bb20007190ae7aa89929c02c03317b1e6876 (patch) | |
| tree | d03bc02056b96ea399cf947fe2074fa4365361ff /doc/build/orm | |
| parent | ea87d39d7a9926dc1c6bf3d70e8faf8575769cb0 (diff) | |
| download | sqlalchemy-f247bb20007190ae7aa89929c02c03317b1e6876.tar.gz | |
Documentation updates for ResultProxy -> Result
This is based off of
I8091919d45421e3f53029b8660427f844fee0228 and includes
all documentation-only changes as a separate merge,
once the parent is merged.
Change-Id: I711adea23df0f9f0b1fe7c76210bd2de6d31842d
Diffstat (limited to 'doc/build/orm')
| -rw-r--r-- | doc/build/orm/persistence_techniques.rst | 2 | ||||
| -rw-r--r-- | doc/build/orm/session_transaction.rst | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/build/orm/persistence_techniques.rst b/doc/build/orm/persistence_techniques.rst index f0a01d7ea..18e4d1269 100644 --- a/doc/build/orm/persistence_techniques.rst +++ b/doc/build/orm/persistence_techniques.rst @@ -79,7 +79,7 @@ SQL expressions and strings can be executed via the :class:`~sqlalchemy.orm.session.Session` within its transactional context. This is most easily accomplished using the :meth:`~.Session.execute` method, which returns a -:class:`~sqlalchemy.engine.ResultProxy` in the same manner as an +:class:`~sqlalchemy.engine.CursorResult` in the same manner as an :class:`~sqlalchemy.engine.Engine` or :class:`~sqlalchemy.engine.Connection`:: diff --git a/doc/build/orm/session_transaction.rst b/doc/build/orm/session_transaction.rst index 8bda0371a..233768f42 100644 --- a/doc/build/orm/session_transaction.rst +++ b/doc/build/orm/session_transaction.rst @@ -424,7 +424,7 @@ on the target connection, a warning is emitted:: >>> session = Session(eng) >>> session.execute("select 1") - <sqlalchemy.engine.result.ResultProxy object at 0x1017a6c50> + <sqlalchemy.engine.result.CursorResult object at 0x1017a6c50> >>> session.connection(execution_options={'isolation_level': 'SERIALIZABLE'}) sqlalchemy/orm/session.py:310: SAWarning: Connection is already established for the given bind; execution_options ignored |