From 32db849e0df1db357df79df3a0dc2263a755d04e Mon Sep 17 00:00:00 2001 From: Mark Elliot <123787712+mark-thm@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:19:59 -0400 Subject: [PATCH] Resolve CI failures --- lib/sqlalchemy/orm/properties.py | 2 +- lib/sqlalchemy/sql/base.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index adee44a77e..4200802845 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -689,7 +689,7 @@ class MappedColumn( supercls_mapper = class_mapper(decl_scan.inherits, False) colname = column.name if column.name is not None else key - column = self.column = supercls_mapper.local_table.c.get( # type: ignore # noqa: E501 + column = self.column = supercls_mapper.local_table.c.get( # noqa: E501 colname, column ) diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py index 2f0fcc5529..bf24540689 100644 --- a/lib/sqlalchemy/sql/base.py +++ b/lib/sqlalchemy/sql/base.py @@ -1642,7 +1642,7 @@ class ColumnCollection(Generic[_COLKEY, _COL_co]): return self.compare(other) @overload - def get(self, key: str, default: _COL_co) -> _COL_co: ... + def get(self, key: str, default: _COL) -> _COL: ... @overload def get( -- 2.47.2