diff options
| author | Federico Caselli <cfederico87@gmail.com> | 2022-10-17 22:02:13 +0200 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2022-11-02 21:38:31 -0400 |
| commit | d10b62f54e6b9dd0613c0412b924c1b346ec1611 (patch) | |
| tree | 07d246255d0372c5a7839e1aec354edacf687fdf /lib/sqlalchemy/orm/scoping.py | |
| parent | 66e591cf8a5de6d5dabdecf2bb279dec90962e15 (diff) | |
| download | sqlalchemy-d10b62f54e6b9dd0613c0412b924c1b346ec1611.tar.gz | |
Improve typings of execution options
Fixes: #8605
Change-Id: I4aec83b9f321462427c3f4ac941c3b272255c088
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
| -rw-r--r-- | lib/sqlalchemy/orm/scoping.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py index 1971caedc..3ec2db4e6 100644 --- a/lib/sqlalchemy/orm/scoping.py +++ b/lib/sqlalchemy/orm/scoping.py @@ -36,6 +36,7 @@ from ..util.typing import Protocol if TYPE_CHECKING: from ._typing import _EntityType from ._typing import _IdentityKeyType + from ._typing import OrmExecuteOptionsParameter from .identity import IdentityMap from .interfaces import ORMOption from .mapper import Mapper @@ -55,7 +56,6 @@ if TYPE_CHECKING: from ..engine.interfaces import _CoreAnyExecuteParams from ..engine.interfaces import _CoreSingleExecuteParams from ..engine.interfaces import _ExecuteOptions - from ..engine.interfaces import _ExecuteOptionsParameter from ..engine.result import ScalarResult from ..sql._typing import _ColumnsClauseArgument from ..sql._typing import _T0 @@ -618,7 +618,7 @@ class scoped_session(Generic[_S]): statement: TypedReturnsRows[_T], params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, @@ -631,7 +631,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, @@ -643,7 +643,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, @@ -876,7 +876,7 @@ class scoped_session(Generic[_S]): populate_existing: bool = False, with_for_update: Optional[ForUpdateArg] = None, identity_token: Optional[Any] = None, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, ) -> Optional[_O]: r"""Return an instance based on the given primary key identifier, or ``None`` if not found. @@ -1672,7 +1672,7 @@ class scoped_session(Generic[_S]): statement: TypedReturnsRows[Tuple[_T]], params: Optional[_CoreSingleExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> Optional[_T]: @@ -1684,7 +1684,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreSingleExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> Any: @@ -1695,7 +1695,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreSingleExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> Any: @@ -1727,7 +1727,7 @@ class scoped_session(Generic[_S]): statement: TypedReturnsRows[Tuple[_T]], params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> ScalarResult[_T]: @@ -1739,7 +1739,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> ScalarResult[Any]: @@ -1750,7 +1750,7 @@ class scoped_session(Generic[_S]): statement: Executable, params: Optional[_CoreAnyExecuteParams] = None, *, - execution_options: _ExecuteOptionsParameter = util.EMPTY_DICT, + execution_options: OrmExecuteOptionsParameter = util.EMPTY_DICT, bind_arguments: Optional[_BindArguments] = None, **kw: Any, ) -> ScalarResult[Any]: |