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

author	Mike Bayer <mike_mp@zzzcomputing.com>
	Thu, 10 Feb 2022 02:59:43 +0000 (21:59 -0500)
committer	Mike Bayer <mike_mp@zzzcomputing.com>
	Thu, 10 Feb 2022 03:38:37 +0000 (22:38 -0500)
commit	327d425c6355718f8c9d9c90270db1c81c868dea
tree	19612e3aafe06dd9fbf4fe59e905f7cdeef1ceed	tree \| snapshot
parent	d0c53282de4d5a224d786134d29ba6632ae1b3fe	commit \| diff

doc fixes

* clarify merge behavior for non-present attributes,
  references #7687
* fix AsyncSession in async_scoped_session documentation,
  name the scoped session AsyncScopedSession, fixes: #7671
* Use non-deprecated execute() style in sqltypes JSON examples,
  fixes: #7633
* Add note regarding mitigation for
  https://github.com/MagicStack/asyncpg/issues/727,
  fixes #7245

Fixes: #7671
Fixes: #7633
Fixes: #7245
Change-Id: Ic40b4378ca321367a912864f4eddfdd9714fe217
(cherry picked from commit 449389a45f358300ba95f7d03c7b94b64703e31a)

doc/build/orm/extensions/asyncio.rst		diff \| blob \| blame \| history
doc/build/orm/session_state_management.rst		diff \| blob \| blame \| history
lib/sqlalchemy/dialects/postgresql/asyncpg.py		diff \| blob \| blame \| history
lib/sqlalchemy/sql/sqltypes.py		diff \| blob \| blame \| history