diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-09-29 17:17:44 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2021-09-29 17:17:44 -0400 |
| commit | 935303e82c9316b3f98371c916a3e2ad00140808 (patch) | |
| tree | fdf237f546ff9724a895aa2a281812adde81abe8 /lib/sqlalchemy | |
| parent | d496639613382a0140f2e2260b82979255a28ffd (diff) | |
| parent | 91c23f261c9162bcd0f27575dd45ce39487a3559 (diff) | |
| download | sqlalchemy-935303e82c9316b3f98371c916a3e2ad00140808.tar.gz | |
Merge branch 'master' of ssh://gerrit.sqlalchemy.org:29418/sqlalchemy/sqlalchemy
Change-Id: I610fecd5f40742db43de0a92e2b61a96f0ef1963
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/ext/asyncio/scoping.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/ext/asyncio/scoping.py b/lib/sqlalchemy/ext/asyncio/scoping.py index 7fa8cba5c..4e7f15c1f 100644 --- a/lib/sqlalchemy/ext/asyncio/scoping.py +++ b/lib/sqlalchemy/ext/asyncio/scoping.py @@ -40,6 +40,9 @@ from ...util import ScopedRegistry "refresh", "rollback", "scalar", + "scalars", + "stream", + "stream_scalars", ], attributes=[ "bind", diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 353caa8fe..df3012df1 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -105,6 +105,7 @@ class ScopedSessionMixin(object): "refresh", "rollback", "scalar", + "scalars", ], attributes=[ "bind", |