summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/properties.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
-rw-r--r--lib/sqlalchemy/orm/properties.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index 785a1a098..b8e1521a2 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -436,7 +436,7 @@ class ColumnProperty(
try:
return ce.info # type: ignore
except AttributeError:
- return self.prop.info
+ return self.prop.info # type: ignore
def _memoized_attr_expressions(self) -> Sequence[NamedColumn[Any]]:
"""The full sequence of columns referenced by this
@@ -684,10 +684,10 @@ class MappedColumn(
) -> None:
sqltype = self.column.type
- if is_fwd_ref(argument):
+ if is_fwd_ref(argument, check_generic=True):
assert originating_module is not None
argument = de_stringify_annotation(
- cls, argument, originating_module
+ cls, argument, originating_module, include_generic=True
)
if is_union(argument):