diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-12-09 19:49:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-12-09 19:49:41 +0000 |
| commit | a35f9d0e3b24661d2dfcab799404e97ff8e3318f (patch) | |
| tree | a8e96fc50405eab7c95045351dbbb2886f448db6 /doc | |
| parent | 7e9b1450b6899c82c9362cbc92fcc0f01c97b043 (diff) | |
| parent | 30e42a8d302ac7885e4d2f8547038ab66480346a (diff) | |
| download | sqlalchemy-a35f9d0e3b24661d2dfcab799404e97ff8e3318f.tar.gz | |
Merge "Better syncronize async result docs with plain ones." into main
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/build/changelog/unreleased_14/8952.rst | 8 | ||||
| -rw-r--r-- | doc/build/core/connections.rst | 3 | ||||
| -rw-r--r-- | doc/build/orm/extensions/asyncio.rst | 5 |
3 files changed, 15 insertions, 1 deletions
diff --git a/doc/build/changelog/unreleased_14/8952.rst b/doc/build/changelog/unreleased_14/8952.rst new file mode 100644 index 000000000..32a36e84a --- /dev/null +++ b/doc/build/changelog/unreleased_14/8952.rst @@ -0,0 +1,8 @@ +.. change:: + :tags: bug, asyncio + :tickets: 8952 + :versions: 2.0.0b5 + + Removed non-functional method ``merge`` from :class:`_asyncio.AsyncResult`. + This method was non-functional and non-testes since the first introduction + of asyncio in SQLAlchemy. diff --git a/doc/build/core/connections.rst b/doc/build/core/connections.rst index a39c452f6..4d97f82bc 100644 --- a/doc/build/core/connections.rst +++ b/doc/build/core/connections.rst @@ -2304,7 +2304,7 @@ Connection / Engine API :inherited-members: -Result Set API +Result Set API --------------- .. autoclass:: ChunkedIteratorResult @@ -2345,3 +2345,4 @@ Result Set API .. autoclass:: RowMapping :members: +.. autoclass:: TupleResult diff --git a/doc/build/orm/extensions/asyncio.rst b/doc/build/orm/extensions/asyncio.rst index 102c65056..f3bf6dda3 100644 --- a/doc/build/orm/extensions/asyncio.rst +++ b/doc/build/orm/extensions/asyncio.rst @@ -939,12 +939,17 @@ cursor. .. autoclass:: AsyncResult :members: + :inherited-members: .. autoclass:: AsyncScalarResult :members: + :inherited-members: .. autoclass:: AsyncMappingResult :members: + :inherited-members: + +.. autoclass:: AsyncTupleResult ORM Session API Documentation ----------------------------- |