improved version

django/db/models/sql/compiler.pyi

@@ -1,5 +1,6 @@
 from django.db.backends.sqlite3.base import DatabaseWrapper
 from django.db.backends.utils import CursorWrapper
+from django.db.models.base import Model
 from django.db.models.expressions import (
     Col,
     CombinedExpression,
@@ -21,6 +22,7 @@ from typing import (
     Optional,
     Set,
     Tuple,
+    Type,
     Union,
 )
 
@@ -44,14 +46,14 @@ class SQLCompiler:
         alias: str,
         columns: List[str],
         compiler: SQLCompiler
-    ) -> Union[Tuple[str, Tuple[str]], Tuple[str, Tuple]]: ...
+    ) -> Union[Tuple[str, Tuple], Tuple[str, Tuple[str]]]: ...
     def collapse_group_by(
         self,
-        expressions: Union[List[Col], List[Union[Col, Trunc]], List[Expression], List[Union[Col, CombinedExpression]]],
-        having: Union[List[Col], Tuple, List[CombinedExpression]]
-    ) -> Union[List[Col], List[Union[Col, Trunc]], List[Expression], List[Union[Col, CombinedExpression]]]: ...
+        expressions: Union[List[Union[Col, CombinedExpression]], List[Expression], List[Col], List[Union[Col, Trunc]]],
+        having: Union[List[CombinedExpression], List[Col], Tuple]
+    ) -> Union[List[Union[Col, CombinedExpression]], List[Expression], List[Col], List[Union[Col, Trunc]]]: ...
     def compile(self, node: Any, select_format: object = ...) -> Any: ...
-    def deferred_to_columns(self) -> Any: ...
+    def deferred_to_columns(self) -> Dict[Type[Model], Set[str]]: ...
     def execute_sql(
         self,
         result_type: str = ...,
@@ -65,7 +67,7 @@ class SQLCompiler:
         opts: Options,
         alias: Optional[str] = ...,
         default_order: str = ...,
-        already_seen: Optional[Union[Set[Tuple[None, Tuple[Tuple[str, str]]]], Set[Tuple[None, Tuple[Tuple[str, str]], Tuple[Tuple[str, str]], Tuple[Tuple[str, str]]]], Set[Union[Tuple[None, Tuple[Tuple[str, str]]], Tuple[Tuple[Tuple[str, str]], Tuple[Tuple[str, str]]]]]]] = ...
+        already_seen: Optional[Union[Set[Tuple[None, Tuple[Tuple[str, str]]]], Set[Union[Tuple[None, Tuple[Tuple[str, str]]], Tuple[Tuple[Tuple[str, str]], Tuple[Tuple[str, str]]]]], Set[Tuple[None, Tuple[Tuple[str, str]], Tuple[Tuple[str, str]], Tuple[Tuple[str, str]]]]]] = ...
     ) -> List[Tuple[OrderBy, bool]]: ...
     def get_combinator_sql(
         self,
@@ -77,22 +79,22 @@ class SQLCompiler:
         self,
         start_alias: Optional[str] = ...,
         opts: Optional[Options] = ...,
-        from_parent: Any = ...
+        from_parent: Optional[Type[Model]] = ...
     ) -> List[Col]: ...
     def get_distinct(self) -> Tuple[List[Any], List[Any]]: ...
     def get_extra_select(
         self,
-        order_by: Union[List[Tuple[OrderBy, Tuple[str, List[Any], bool]]], List[Union[Tuple[OrderBy, Tuple[str, List[int], bool]], Tuple[OrderBy, Tuple[str, List[Any], bool]]]], List[Tuple[OrderBy, Tuple[str, Tuple, bool]]]],
+        order_by: Union[List[Tuple[OrderBy, Tuple[str, List[Any], bool]]], List[Tuple[OrderBy, Tuple[str, Tuple, bool]]], List[Union[Tuple[OrderBy, Tuple[str, List[int], bool]], Tuple[OrderBy, Tuple[str, List[Any], bool]]]]],
         select: Any
     ) -> List[Tuple[OrderBy, Tuple[str, List[Any]], None]]: ...
     def get_from_clause(
         self
-    ) -> Union[Tuple[List[str], List[Union[int, str]]], Tuple[List[str], List[Any]], Tuple[List[str], List[int]], Tuple[List[str], List[str]]]: ...
+    ) -> Union[Tuple[List[str], List[Any]], Tuple[List[str], List[Union[int, str]]], Tuple[List[str], List[int]], Tuple[List[str], List[str]]]: ...
     def get_group_by(
         self,
         select: Any,
         order_by: Any
-    ) -> Union[List[Union[Tuple[str, List[Any]], Tuple[str, List[str]]]], List[Tuple[str, List[Any]]], List[Union[Tuple[str, List[Any]], Tuple[str, List[int]]]]]: ...
+    ) -> Union[List[Tuple[str, List[Any]]], List[Union[Tuple[str, List[Any]], Tuple[str, List[str]]]], List[Union[Tuple[str, List[Any]], Tuple[str, List[int]]]]]: ...
     def get_order_by(self) -> Any: ...
     def get_related_selections(
         self,
@@ -102,7 +104,7 @@ class SQLCompiler:
         cur_depth: int = ...,
         requested: Any = ...,
         restricted: Optional[bool] = ...
-    ) -> Any: ...
+    ) -> List[Dict[str, Any]]: ...
     def get_select(self) -> Any: ...
     def has_results(self) -> bool: ...
     def pre_sql_setup(self) -> Any: ...

django/db/models/sql/datastructures.pyi

@@ -31,7 +31,7 @@ class BaseTable:
 class Join:
     def __eq__(
         self,
-        other: Union[Join, BaseTable]
+        other: Union[BaseTable, Join]
     ) -> bool: ...
     def __init__(
         self,
@@ -47,17 +47,17 @@ class Join:
         self,
         compiler: SQLCompiler,
         connection: DatabaseWrapper
-    ) -> Union[Tuple[str, List[int]], Tuple[str, List[Any]], Tuple[str, List[str]]]: ...
+    ) -> Union[Tuple[str, List[int]], Tuple[str, List[str]], Tuple[str, List[Any]]]: ...
     def demote(self) -> Join: ...
     def equals(
         self,
-        other: Union[Join, BaseTable],
+        other: Union[BaseTable, Join],
         with_filtered_relation: bool
     ) -> bool: ...
     def promote(self) -> Join: ...
     def relabeled_clone(
         self,
-        change_map: Union[Dict[str, str], OrderedDict]
+        change_map: Union[OrderedDict, Dict[str, str]]
     ) -> Join: ...
 
 

django/db/models/sql/query.pyi

@@ -1,6 +1,6 @@
+from django.db.models.base import Model
 from django.db.models.sql.where import WhereNode
 from typing import (
-    Any,
     Set,
     Tuple,
     Type,
@@ -10,9 +10,13 @@ from typing import (
 
 class JoinPromoter:
     def __init__(self, connector: str, num_children: int, negated: bool) -> None: ...
-    def add_votes(self, votes: Union[Tuple, Set[str]]) -> None: ...
+    def add_votes(self, votes: Union[Set[str], Tuple]) -> None: ...
     def update_join_types(self, query: Query) -> Set[str]: ...
 
 
 class Query:
-    def __init__(self, model: Any, where: Type[WhereNode] = ...) -> None: ...
+    def __init__(
+        self,
+        model: Type[Model],
+        where: Type[WhereNode] = ...
+    ) -> None: ...

django/db/models/sql/subqueries.pyi

@@ -41,4 +41,4 @@ class UpdateQuery:
     def add_update_values(self, values: Dict[str, Any]) -> None: ...
     def clone(self) -> UpdateQuery: ...
     def get_related_updates(self) -> List[UpdateQuery]: ...
-    def update_batch(self, pk_list: List[int], values: Dict[str, Union[None, int]], using: str) -> None: ...
+    def update_batch(self, pk_list: List[int], values: Dict[str, Optional[int]], using: str) -> None: ...

django/db/models/sql/where.pyi

@@ -79,7 +79,7 @@ class WhereNode:
     ) -> Union[List[CombinedExpression], List[Col]]: ...
     def get_source_expressions(
         self
-    ) -> Union[List[GreaterThan], List[IntegerLessThan], List[Exact], List[LessThanOrEqual]]: ...
+    ) -> Union[List[GreaterThan], List[LessThanOrEqual], List[Exact], List[IntegerLessThan]]: ...
     def relabel_aliases(
         self,
         change_map: Union[OrderedDict, Dict[str, str], Dict[Union[str, None], str]]
@@ -96,4 +96,4 @@ class WhereNode:
     def split_having(
         self,
         negated: bool = ...
-    ) -> Union[Tuple[WhereNode, None], Tuple[None, WhereNode], Tuple[WhereNode, WhereNode]]: ...
+    ) -> Union[Tuple[None, WhereNode], Tuple[WhereNode, WhereNode], Tuple[WhereNode, None]]: ...