Skip to content

Commit aa329b2

Browse files
Add execution_options to Session.get() (python#6656)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
1 parent 5ca6666 commit aa329b2

3 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎stubs/SQLAlchemy/sqlalchemy/orm/decl_api.pyi‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from collections.abc import Callable
2-
from typing import Any, ClassVar, Type, TypeVar, overload
2+
from typing import Any, ClassVar, TypeVar, overload
33

44
from ..engine.interfaces import Connectable
55
from ..sql.schema import MetaData
66
from ..util import hybridproperty
77
from . import interfaces
88

9-
_ClsT = TypeVar("_ClsT", bound=Type[Any])
10-
_DeclT = TypeVar("_DeclT", bound=Type[_DeclarativeBase])
9+
_ClsT = TypeVar("_ClsT", bound=type[Any])
10+
_DeclT = TypeVar("_DeclT", bound=type[_DeclarativeBase])
1111

1212
# Dynamic class as created by registry.generate_base() via DeclarativeMeta
1313
# or another metaclass. This class does not exist at runtime.
@@ -21,12 +21,12 @@ class _DeclarativeBase(Any): # super classes are dynamic
2121
__class_getitem__: ClassVar[Any]
2222

2323
# Meta class (or function) that creates a _DeclarativeBase class.
24-
_DeclarativeBaseMeta = Callable[[str, tuple[Type[Any], ...], dict[str, Any]], _DeclT]
24+
_DeclarativeBaseMeta = Callable[[str, tuple[type[Any], ...], dict[str, Any]], _DeclT]
2525

26-
def has_inherited_table(cls: Type[Any]) -> bool: ...
26+
def has_inherited_table(cls: type[Any]) -> bool: ...
2727

2828
class DeclarativeMeta(type):
29-
def __init__(cls, classname: str, bases: tuple[Type[Any], ...], dict_: dict[str, Any], **kw: object) -> None: ...
29+
def __init__(cls, classname: str, bases: tuple[type[Any], ...], dict_: dict[str, Any], **kw: object) -> None: ...
3030
def __setattr__(cls, key: str, value: Any) -> None: ...
3131
def __delattr__(cls, key: str) -> None: ...
3232

@@ -49,20 +49,20 @@ def declarative_base(
4949
bind: Connectable | None = ...,
5050
metadata: MetaData | None = ...,
5151
mapper: Any | None = ...,
52-
cls: Type[Any] | tuple[Type[Any], ...] = ...,
52+
cls: type[Any] | tuple[type[Any], ...] = ...,
5353
name: str = ...,
5454
constructor: Callable[..., None] = ...,
55-
class_registry: dict[str, Type[Any]] | None = ...,
56-
) -> Type[_DeclarativeBase]: ...
55+
class_registry: dict[str, type[Any]] | None = ...,
56+
) -> type[_DeclarativeBase]: ...
5757
@overload
5858
def declarative_base(
5959
bind: Connectable | None = ...,
6060
metadata: MetaData | None = ...,
6161
mapper: Any | None = ...,
62-
cls: Type[Any] | tuple[Type[Any], ...] = ...,
62+
cls: type[Any] | tuple[type[Any], ...] = ...,
6363
name: str = ...,
6464
constructor: Callable[..., None] = ...,
65-
class_registry: dict[str, Type[Any]] | None = ...,
65+
class_registry: dict[str, type[Any]] | None = ...,
6666
*,
6767
metaclass: _DeclarativeBaseMeta[_DeclT],
6868
) -> _DeclT: ...
@@ -71,10 +71,10 @@ def declarative_base(
7171
bind: Connectable | None,
7272
metadata: MetaData | None,
7373
mapper: Any | None,
74-
cls: Type[Any] | tuple[Type[Any], ...],
74+
cls: type[Any] | tuple[type[Any], ...],
7575
name: str,
7676
constructor: Callable[..., None],
77-
class_registry: dict[str, Type[Any]] | None,
77+
class_registry: dict[str, type[Any]] | None,
7878
metaclass: _DeclarativeBaseMeta[_DeclT],
7979
) -> _DeclT: ...
8080

@@ -84,7 +84,7 @@ class registry:
8484
def __init__(
8585
self,
8686
metadata: MetaData | None = ...,
87-
class_registry: dict[str, Type[Any]] | None = ...,
87+
class_registry: dict[str, type[Any]] | None = ...,
8888
constructor: Callable[..., None] = ...,
8989
_bind: Connectable | None = ...,
9090
) -> None: ...
@@ -94,21 +94,21 @@ class registry:
9494
def dispose(self, cascade: bool = ...) -> None: ...
9595
@overload
9696
def generate_base(
97-
self, mapper: Any | None = ..., cls: Type[Any] | tuple[Type[Any], ...] = ..., name: str = ...
98-
) -> Type[_DeclarativeBase]: ...
97+
self, mapper: Any | None = ..., cls: type[Any] | tuple[type[Any], ...] = ..., name: str = ...
98+
) -> type[_DeclarativeBase]: ...
9999
@overload
100100
def generate_base(
101101
self,
102102
mapper: Any | None = ...,
103-
cls: Type[Any] | tuple[Type[Any], ...] = ...,
103+
cls: type[Any] | tuple[type[Any], ...] = ...,
104104
name: str = ...,
105105
*,
106106
metaclass: _DeclarativeBaseMeta[_DeclT],
107107
) -> _DeclT: ...
108108
@overload
109109
def generate_base(
110-
self, mapper: Any | None, cls: Type[Any] | tuple[Type[Any], ...], name: str, metaclass: _DeclarativeBaseMeta[_DeclT]
111-
) -> Type[_DeclarativeBase]: ...
110+
self, mapper: Any | None, cls: type[Any] | tuple[type[Any], ...], name: str, metaclass: _DeclarativeBaseMeta[_DeclT]
111+
) -> type[_DeclarativeBase]: ...
112112
def mapped(self, cls: _ClsT) -> _ClsT: ...
113113
# Return type of the callable is a _DeclarativeBase class with the passed in class as base.
114114
# This could be better approximated with Intersection[PassedInClass, _DeclarativeBase].
@@ -122,7 +122,7 @@ def as_declarative(
122122
*,
123123
bind: Connectable | None = ...,
124124
metadata: MetaData | None = ...,
125-
class_registry: dict[str, Type[Any]] | None = ...,
125+
class_registry: dict[str, type[Any]] | None = ...,
126126
mapper: Any | None = ...,
127127
metaclass: _DeclarativeBaseMeta[_DeclT] = ...,
128128
) -> Callable[[_ClsT], _ClsT | _DeclT | Any]: ...

‎stubs/SQLAlchemy/sqlalchemy/orm/scoping.pyi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ class scoped_session(ScopedSessionMixin):
7070
populate_existing: bool = ...,
7171
with_for_update: Any | None = ...,
7272
identity_token: Any | None = ...,
73+
execution_options: Any | None = ...,
7374
): ...
7475
def get_bind(
7576
self,

‎stubs/SQLAlchemy/sqlalchemy/orm/session.pyi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ class Session(_SessionClassMethods):
157157
populate_existing: bool = ...,
158158
with_for_update: Any | None = ...,
159159
identity_token: Any | None = ...,
160+
execution_options: Any | None = ...,
160161
): ...
161162
def merge(self, instance, load: bool = ..., options: Any | None = ...): ...
162163
def enable_relationship_loading(self, obj) -> None: ...

0 commit comments

Comments
 (0)