Skip to content

Commit 30e42a8

Browse files
committed
Better syncronize async result docs with plain ones.
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. Fixes: #7158 Fixes: #8952 Change-Id: Ibc3d17be8a8b7cab9bf2074f0408f74b4c4b161d
1 parent 8a152ec commit 30e42a8

File tree

7 files changed

+272
-284
lines changed

7 files changed

+272
-284
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ test/test_schema.db
3939
/.pytest_cache
4040
/db_idents.txt
4141
.DS_Store
42+
.vs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
.. change::
2+
:tags: bug, asyncio
3+
:tickets: 8952
4+
:versions: 2.0.0b5
5+
6+
Removed non-functional method ``merge`` from :class:`_asyncio.AsyncResult`.
7+
This method was non-functional and non-testes since the first introduction
8+
of asyncio in SQLAlchemy.

doc/build/core/connections.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@ Connection / Engine API
23042304
:inherited-members:
23052305

23062306

2307-
Result Set API
2307+
Result Set API
23082308
---------------
23092309

23102310
.. autoclass:: ChunkedIteratorResult
@@ -2345,3 +2345,4 @@ Result Set API
23452345
.. autoclass:: RowMapping
23462346
:members:
23472347

2348+
.. autoclass:: TupleResult

doc/build/orm/extensions/asyncio.rst

+5
Original file line numberDiff line numberDiff line change
@@ -939,12 +939,17 @@ cursor.
939939

940940
.. autoclass:: AsyncResult
941941
:members:
942+
:inherited-members:
942943

943944
.. autoclass:: AsyncScalarResult
944945
:members:
946+
:inherited-members:
945947

946948
.. autoclass:: AsyncMappingResult
947949
:members:
950+
:inherited-members:
951+
952+
.. autoclass:: AsyncTupleResult
948953

949954
ORM Session API Documentation
950955
-----------------------------

0 commit comments

Comments
 (0)