From: Dzmitar <17720985+dzmitar@users.noreply.github.com>
Date: Tue, 27 Dec 2022 20:07:01 +0000 (+0100)
Subject: Fix type annotations in sqlalchemy.sql.selectable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c156cae4551c3fa447cb5f27b424a7d85a1f45b2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Fix type annotations in sqlalchemy.sql.selectable
---

diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py
index 0def2c2c36..f0f478a555 100644
--- a/lib/sqlalchemy/sql/selectable.py
+++ b/lib/sqlalchemy/sql/selectable.py
@@ -1330,8 +1330,8 @@ class Join(roles.DMLTableRole, FromClause):
     @classmethod
     def _join_condition(
         cls,
-        a: Union[Table, Join, Subquery],
-        b: Union[Table, Join],
+        a: FromClause,
+        b: FromClause,
         *,
         a_subset: Optional[FromClause] = None,
         consider_as_foreign_keys: Optional[
@@ -1469,8 +1469,8 @@ class Join(roles.DMLTableRole, FromClause):
     @classmethod
     def _joincond_trim_constraints(
         cls,
-        a: Union[Table, Join, Subquery],
-        b: Union[Table, Join],
+        a: FromClause,
+        b: FromClause,
         constraints: Dict[Any, Any],
         consider_as_foreign_keys: Optional[Any],
     ) -> None:
@@ -2057,7 +2057,7 @@ class CTE(
         recursive: bool = False,
         nesting: bool = False,
         _cte_alias: Optional[CTE] = None,
-        _restates: Optional[Any] = None,
+        _restates: Optional[CTE] = None,
         _prefixes: Optional[Tuple[()]] = None,
         _suffixes: Optional[Tuple[()]] = None,
     ) -> None:
@@ -2161,7 +2161,7 @@ class CTE(
             _suffixes=self._suffixes,
         )
 
-    def _get_reference_cte(self) -> Optional[Any]:
+    def _get_reference_cte(self) -> CTE:
         """
         A recursive CTE is updated to attach the recursive part.
         Updated CTEs should still refer to the original CTE.