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	Federico Caselli <cfederico87@gmail.com>
	Fri, 9 Dec 2022 18:06:59 +0000 (19:06 +0100)
commit	30e42a8d302ac7885e4d2f8547038ab66480346a
tree	2ff585c5a5e559fc5d1ca3c203f7ca0b54f4f260	tree \| snapshot
parent	8a152ec391118a05ac54974d0f013cf0e99c7832	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

.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/__init__.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