git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit

]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commit

projects / thirdparty / sqlalchemy / sqlalchemy.git / commit

author	Federico Caselli <cfederico87@gmail.com>
	Thu, 8 Dec 2022 18:34:49 +0000 (19:34 +0100)
committer	Mike Bayer <mike_mp@zzzcomputing.com>
	Fri, 9 Dec 2022 19:52:57 +0000 (14:52 -0500)
commit	c68f6b28ed1294b955d18707947f44951a1c482e
tree	547a9c2668ffc33127322533661f6bad664cc7f4	tree
parent	3fd9c5c5ac2910cc08eb1284860d7300288daf47	commit \| diff

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
(cherry picked from commit ab8a21c613fb6c69b07f053e4622a4426b2e9ef0)

.gitignore		diff \| blob \| blame \| history
doc/build/changelog/unreleased_14/8952.rst	[new file with mode: 0644]	blob
doc/build/core/connections.rst		diff \| blob \| blame \| history
doc/build/orm/extensions/asyncio.rst		diff \| blob \| blame \| history
lib/sqlalchemy/engine/result.py		diff \| blob \| blame \| history
lib/sqlalchemy/ext/asyncio/result.py		diff \| blob \| blame \| history

Mirror of https://github.com/sqlalchemy/sqlalchemy.git

RSS Atom