summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/scoping.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/scoping.py')
-rw-r--r--lib/sqlalchemy/orm/scoping.py22
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]: