summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2023-02-27 15:28:28 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2023-02-27 15:28:28 +0000
commitc76f5933735ab19f5e409d1dd25aafe0e4fa399b (patch)
tree0c4b18be7684f847b99b9c224578d72a32e6d2cf /lib/sqlalchemy
parent1dadf3584ab9d3a34544b8cb40f787927e55c789 (diff)
parent097e1eacaaf43f728c552df9ebbfa0fb81c4b6c7 (diff)
downloadsqlalchemy-c76f5933735ab19f5e409d1dd25aafe0e4fa399b.tar.gz
Merge "fix with_polymorphic" into main
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/_orm_constructors.py2
-rw-r--r--lib/sqlalchemy/orm/util.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py
index 3bd1db79d..64e7937f1 100644
--- a/lib/sqlalchemy/orm/_orm_constructors.py
+++ b/lib/sqlalchemy/orm/_orm_constructors.py
@@ -2208,7 +2208,7 @@ def aliased(
def with_polymorphic(
- base: Union[_O, Mapper[_O]],
+ base: Union[Type[_O], Mapper[_O]],
classes: Union[Literal["*"], Iterable[Type[Any]]],
selectable: Union[Literal[False, None], FromClause] = False,
flat: bool = False,
diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 7966f6cd9..d3e36a494 100644
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -1053,7 +1053,7 @@ class AliasedInsp(
@classmethod
def _with_polymorphic_factory(
cls,
- base: Union[_O, Mapper[_O]],
+ base: Union[Type[_O], Mapper[_O]],
classes: Union[Literal["*"], Iterable[_EntityType[Any]]],
selectable: Union[Literal[False, None], FromClause] = False,
flat: bool = False,