From: Yannick PÉROUX Date: Tue, 4 Nov 2025 10:28:25 +0000 (+0100) Subject: Fix func.coalesce when used with @hybrid_property X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81edda745396715367ecd92bca051cc3b46f6936;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Fix func.coalesce when used with @hybrid_property --- diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py index d4aafd3625..10ae5b391f 100644 --- a/lib/sqlalchemy/sql/functions.py +++ b/lib/sqlalchemy/sql/functions.py @@ -1076,7 +1076,7 @@ class _FunctionGenerator: @overload def coalesce( self, - col: _ColumnExpressionArgument[_T], + col: _ColumnExpressionArgument[Optional[_T]], *args: _ColumnExpressionOrLiteralArgument[Any], **kwargs: Any, ) -> coalesce[_T]: ... @@ -1084,14 +1084,14 @@ class _FunctionGenerator: @overload def coalesce( self, - col: _T, + col: Optional[_T], *args: _ColumnExpressionOrLiteralArgument[Any], **kwargs: Any, ) -> coalesce[_T]: ... def coalesce( self, - col: _ColumnExpressionOrLiteralArgument[_T], + col: _ColumnExpressionOrLiteralArgument[Optional[_T]], *args: _ColumnExpressionOrLiteralArgument[Any], **kwargs: Any, ) -> coalesce[_T]: ...