From ca141db9efcded68b550c7951caf8a27f59ae4c7 Mon Sep 17 00:00:00 2001 From: SaJH Date: Thu, 16 May 2024 11:57:25 +0900 Subject: [PATCH 1/2] 5.0: Update django.db.models.query_utils --- django-stubs/db/models/query_utils.pyi | 4 ++-- scripts/stubtest/allowlist_todo.txt | 1 + scripts/stubtest/allowlist_todo_django50.txt | 7 ------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/django-stubs/db/models/query_utils.pyi b/django-stubs/db/models/query_utils.pyi index 563072b24..29e62e571 100644 --- a/django-stubs/db/models/query_utils.pyi +++ b/django-stubs/db/models/query_utils.pyi @@ -88,8 +88,8 @@ class FilteredRelation: relation_name: str alias: str | None condition: Q - path: list[str] def __init__(self, relation_name: str, *, condition: Q = ...) -> None: ... def clone(self) -> FilteredRelation: ... - def resolve_expression(self, *args: Any, **kwargs: Any) -> None: ... + def relabeled_clone(self, change_map: dict[str, str]) -> FilteredRelation: ... + def resolve_expression(self, query: Query, reuse: set[str], *args: Any, **kwargs: Any) -> FilteredRelation: ... def as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ... diff --git a/scripts/stubtest/allowlist_todo.txt b/scripts/stubtest/allowlist_todo.txt index 111c84dcd..c539f3ddc 100644 --- a/scripts/stubtest/allowlist_todo.txt +++ b/scripts/stubtest/allowlist_todo.txt @@ -805,6 +805,7 @@ django.db.models.PositiveSmallIntegerField.formfield django.db.models.PositiveSmallIntegerField.integer_field_class django.db.models.Q.XOR django.db.models.Q.resolve_expression +django.db.models.Q.identity django.db.models.QuerySet.__deepcopy__ django.db.models.QuerySet.__reversed__ django.db.models.QuerySet.__xor__ diff --git a/scripts/stubtest/allowlist_todo_django50.txt b/scripts/stubtest/allowlist_todo_django50.txt index 32ebe046e..36bc437e1 100644 --- a/scripts/stubtest/allowlist_todo_django50.txt +++ b/scripts/stubtest/allowlist_todo_django50.txt @@ -7,8 +7,6 @@ django.contrib.gis.db.models.ExpressionWrapper.allowed_default django.contrib.gis.db.models.F.allowed_default django.contrib.gis.db.models.Field._get_flatchoices django.contrib.gis.db.models.Field.generated -django.contrib.gis.db.models.FilteredRelation.relabeled_clone -django.contrib.gis.db.models.FilteredRelation.resolve_expression django.contrib.gis.db.models.ForeignKey.cast_db_type django.contrib.gis.db.models.ForeignObject.get_joining_fields django.contrib.gis.db.models.ForeignObject.get_reverse_joining_fields @@ -39,8 +37,6 @@ django.db.models.ExpressionWrapper.allowed_default django.db.models.F.allowed_default django.db.models.Field._get_flatchoices django.db.models.Field.generated -django.db.models.FilteredRelation.relabeled_clone -django.db.models.FilteredRelation.resolve_expression django.db.models.ForeignKey.cast_db_type django.db.models.ForeignObject.get_joining_fields django.db.models.ForeignObject.get_reverse_joining_fields @@ -71,9 +67,6 @@ django.db.models.functions.Now.as_oracle django.db.models.functions.datetime.Now.as_oracle django.db.models.lookups.Lookup.allowed_default django.db.models.query.Prefetch.get_current_querysets -django.db.models.query_utils.FilteredRelation.relabeled_clone -django.db.models.query_utils.FilteredRelation.resolve_expression -django.db.models.query_utils.Q.identity django.db.models.sql.Query.build_filtered_relation_q django.db.models.sql.Query.join django.db.models.sql.Query.setup_joins From d8e9eb20c4562b9f0faba64b0106083b7882b66d Mon Sep 17 00:00:00 2001 From: Jae Hyuck Sa Date: Thu, 16 May 2024 13:04:57 +0900 Subject: [PATCH 2/2] Update allowlist_todo.txt --- scripts/stubtest/allowlist_todo.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/stubtest/allowlist_todo.txt b/scripts/stubtest/allowlist_todo.txt index 28e1ef90a..4c2bac32d 100644 --- a/scripts/stubtest/allowlist_todo.txt +++ b/scripts/stubtest/allowlist_todo.txt @@ -800,7 +800,6 @@ django.db.models.PositiveSmallIntegerField.formfield django.db.models.PositiveSmallIntegerField.integer_field_class django.db.models.Q.XOR django.db.models.Q.resolve_expression -django.db.models.Q.identity django.db.models.QuerySet.__deepcopy__ django.db.models.QuerySet.__reversed__ django.db.models.QuerySet.__xor__ @@ -1180,6 +1179,7 @@ django.db.models.query.prefetch_one_level django.db.models.query_utils.InvalidQuery django.db.models.query_utils.Q.XOR django.db.models.query_utils.Q.resolve_expression +django.db.models.query_utils.Q.identity django.db.models.query_utils.RegisterLookupMixin._unregister_lookup django.db.models.query_utils.RegisterLookupMixin.get_class_lookups django.db.models.query_utils.RegisterLookupMixin.get_instance_lookups