Update django.db.models.sql for Django 5.2 (#2606)

Signed-off-by: SaJH <wogur981208@gmail.com>

Author: JaeHyuckSa

django-stubs/db/models/sql/constants.pyi

@@ -4,8 +4,9 @@ GET_ITERATOR_CHUNK_SIZE: Final[int]
 
 MULTI: Literal["multi"]
 SINGLE: Literal["single"]
-CURSOR: Literal["cursor"]
 NO_RESULTS: Literal["no results"]
+CURSOR: Literal["cursor"]
+ROW_COUNT: Literal["row count"]
 
 ORDER_DIR: dict[str, tuple[str, str]]
 

django-stubs/db/models/sql/query.pyi

@@ -66,6 +66,7 @@ class Query(BaseExpression):
     max_depth: int
     join_class: type[Join]
     values_select: tuple
+    selected: dict[str, int | str | Expression] | None
     annotation_select_mask: list[str] | None
     combinator: str | None
     combinator_all: bool
@@ -148,7 +149,7 @@ class Query(BaseExpression):
     ) -> tuple[WhereNode, Iterable[str]]: ...
     def add_select_col(self, col: Any, name: str) -> None: ...
     def add_filter(self, filter_lhs: tuple[str, Any], filter_rhs: tuple[str, Any]) -> None: ...
-    def add_q(self, q_object: Q) -> None: ...
+    def add_q(self, q_object: Q, reuse_all: bool = False) -> None: ...
     def build_where(self, filter_expr: Q | Expression | dict[str, str] | tuple[str, Any]) -> WhereNode: ...
     def add_filtered_relation(self, filtered_relation: FilteredRelation, alias: str) -> None: ...
     def setup_joins(
@@ -214,7 +215,7 @@ class Query(BaseExpression):
     def is_nullable(self, field: Field) -> bool: ...
     def check_filterable(self, expression: Any) -> None: ...
     def build_lookup(self, lookups: Sequence[str], lhs: Expression | Query, rhs: Any) -> Lookup: ...
-    def try_transform(self, lhs: Expression | Query, name: str) -> Transform: ...
+    def try_transform(self, lhs: Expression | Query, name: str, lookups: Sequence[str] | None = ...) -> Transform: ...
     def join(
         self,
         join: BaseTable | Join,

django-stubs/db/models/sql/where.pyi

@@ -5,7 +5,6 @@ from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models.expressions import Expression
 from django.db.models.fields import BooleanField
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType, _ParamsT
-from django.db.models.sql.query import Query
 from django.utils import tree
 from django.utils.functional import cached_property
 
@@ -50,12 +49,3 @@ class ExtraWhere:
     def as_sql(
         self, compiler: SQLCompiler | None = None, connection: BaseDatabaseWrapper | None = None
     ) -> _AsSqlType: ...
-
-class SubqueryConstraint:
-    contains_aggregate: bool
-    alias: str
-    columns: list[str]
-    targets: list[str]
-    query_object: Query
-    def __init__(self, alias: str, columns: list[str], targets: list[str], query_object: Query) -> None: ...
-    def as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...

scripts/stubtest/allowlist_todo_django52.txt

@@ -191,18 +191,10 @@ django.db.models.functions.comparison.JSONObject
 django.db.models.functions.json
 django.db.models.options.Options.is_composite_pk
 django.db.models.options.Options.pk_fields
-django.db.models.sql.Query.add_q
-django.db.models.sql.Query.selected
-django.db.models.sql.Query.try_transform
 django.db.models.sql.compiler.SQLCompiler.as_subquery_condition
 django.db.models.sql.compiler.SQLCompiler.composite_fields_to_tuples
 django.db.models.sql.compiler.SQLCompiler.has_composite_fields
 django.db.models.sql.compiler.SQLInsertCompiler.field_as_sql
-django.db.models.sql.constants.ROW_COUNT
-django.db.models.sql.query.Query.add_q
-django.db.models.sql.query.Query.selected
-django.db.models.sql.query.Query.try_transform
-django.db.models.sql.where.SubqueryConstraint
 django.forms.BaseForm.bound_field_class
 django.forms.BoundField.aria_describedby
 django.forms.Field.__init__