diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2023-02-27 19:13:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2023-02-27 19:13:23 +0000 |
| commit | fcab6bcc5a5a414c9775120f15c7dbd52ccf4ae3 (patch) | |
| tree | ea78c079143d4d63e004565b047fb40d1bd156d2 | |
| parent | 1cce6265a700aee986d6a3421eb3622db32f0c45 (diff) | |
| parent | ff97b9ab5e59283f684edac9a075702c43e8a4c1 (diff) | |
| download | sqlalchemy-fcab6bcc5a5a414c9775120f15c7dbd52ccf4ae3.tar.gz | |
Merge "Add separate version notes for scalars" into main
| -rw-r--r-- | lib/sqlalchemy/ext/asyncio/scoping.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/ext/asyncio/session.py | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/session.py | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/lib/sqlalchemy/ext/asyncio/scoping.py b/lib/sqlalchemy/ext/asyncio/scoping.py index 302010a11..52eeb0828 100644 --- a/lib/sqlalchemy/ext/asyncio/scoping.py +++ b/lib/sqlalchemy/ext/asyncio/scoping.py @@ -1071,7 +1071,10 @@ class async_scoped_session(Generic[_AS]): :return: a :class:`_result.ScalarResult` object - .. versionadded:: 1.4.24 + .. versionadded:: 1.4.24 Added :meth:`_asyncio.AsyncSession.scalars` + + .. versionadded:: 1.4.26 Added + :meth:`_asyncio.async_scoped_session.scalars` .. seealso:: diff --git a/lib/sqlalchemy/ext/asyncio/session.py b/lib/sqlalchemy/ext/asyncio/session.py index 45b70ddeb..dabe1824e 100644 --- a/lib/sqlalchemy/ext/asyncio/session.py +++ b/lib/sqlalchemy/ext/asyncio/session.py @@ -415,7 +415,10 @@ class AsyncSession(ReversibleProxy[Session]): :return: a :class:`_result.ScalarResult` object - .. versionadded:: 1.4.24 + .. versionadded:: 1.4.24 Added :meth:`_asyncio.AsyncSession.scalars` + + .. versionadded:: 1.4.26 Added + :meth:`_asyncio.async_scoped_session.scalars` .. seealso:: diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index f5f894583..787c5a4ab 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -1807,7 +1807,9 @@ class scoped_session(Generic[_S]): :return: a :class:`_result.ScalarResult` object - .. versionadded:: 1.4.24 + .. versionadded:: 1.4.24 Added :meth:`_orm.Session.scalars` + + .. versionadded:: 1.4.26 Added :meth:`_orm.scoped_session.scalars` .. seealso:: diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py index 1a6b050dc..a39dbc3ec 100644 --- a/lib/sqlalchemy/orm/session.py +++ b/lib/sqlalchemy/orm/session.py @@ -2327,7 +2327,9 @@ class Session(_SessionClassMethods, EventTarget): :return: a :class:`_result.ScalarResult` object - .. versionadded:: 1.4.24 + .. versionadded:: 1.4.24 Added :meth:`_orm.Session.scalars` + + .. versionadded:: 1.4.26 Added :meth:`_orm.scoped_session.scalars` .. seealso:: |