Skip to content

Commit 496190e

Browse files
authored
5.0: Update django.db.models.expressions (#2176)
1 parent 5218b4f commit 496190e

File tree

3 files changed

+17
-19
lines changed

3 files changed

+17
-19
lines changed

django-stubs/db/models/expressions.pyi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ class TemporalSubtraction(CombinedExpression):
130130

131131
class F(_Deconstructible, Combinable):
132132
name: str
133+
allowed_default: ClassVar[bool]
133134
def __init__(self, name: str) -> None: ...
134135
def resolve_expression(
135136
self,

scripts/stubtest/allowlist_todo.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ django.contrib.gis.db.models.BigIntegerField.formfield
238238
django.contrib.gis.db.models.BinaryField.get_placeholder
239239
django.contrib.gis.db.models.BooleanField.formfield
240240
django.contrib.gis.db.models.Case.as_sql
241+
django.contrib.gis.db.models.Case.allowed_default
241242
django.contrib.gis.db.models.CharField.cast_db_type
242243
django.contrib.gis.db.models.CharField.description
243244
django.contrib.gis.db.models.CharField.formfield
@@ -256,6 +257,7 @@ django.contrib.gis.db.models.Empty
256257
django.contrib.gis.db.models.Exists.empty_result_set_value
257258
django.contrib.gis.db.models.Exists.select_format
258259
django.contrib.gis.db.models.Expression.identity
260+
django.contrib.gis.db.models.ExpressionWrapper.allowed_default
259261
django.contrib.gis.db.models.Extent.is_extent
260262
django.contrib.gis.db.models.Extent3D.is_extent
261263
django.contrib.gis.db.models.Field.__copy__
@@ -318,6 +320,7 @@ django.contrib.gis.db.models.ForeignObjectRel.get_extra_restriction
318320
django.contrib.gis.db.models.ForeignObjectRel.identity
319321
django.contrib.gis.db.models.ForeignObjectRel.path_infos
320322
django.contrib.gis.db.models.Func.function
323+
django.contrib.gis.db.models.Func.allowed_default
321324
django.contrib.gis.db.models.GenericIPAddressField.formfield
322325
django.contrib.gis.db.models.GeoAggregate
323326
django.contrib.gis.db.models.GeometryField.contribute_to_class
@@ -330,6 +333,7 @@ django.contrib.gis.db.models.IntegerField.formfield
330333
django.contrib.gis.db.models.JSONField.formfield
331334
django.contrib.gis.db.models.JSONField.get_transform
332335
django.contrib.gis.db.models.Lookup.get_prep_lhs
336+
django.contrib.gis.db.models.Lookup.allowed_default
333337
django.contrib.gis.db.models.Lookup.lookup_name
334338
django.contrib.gis.db.models.Lookup.output_field
335339
django.contrib.gis.db.models.Lookup.relabeled_clone
@@ -388,6 +392,7 @@ django.contrib.gis.db.models.Value.empty_result_set_value
388392
django.contrib.gis.db.models.Value.for_save
389393
django.contrib.gis.db.models.Variance.__init__
390394
django.contrib.gis.db.models.When.as_sql
395+
django.contrib.gis.db.models.When.allowed_default
391396
django.contrib.gis.db.models.Window.as_sql
392397
django.contrib.gis.db.models.Window.as_sqlite
393398
django.contrib.gis.db.models.aggregates.Extent.is_extent
@@ -673,6 +678,7 @@ django.db.models.BigIntegerField.formfield
673678
django.db.models.BinaryField.get_placeholder
674679
django.db.models.BooleanField.formfield
675680
django.db.models.Case.as_sql
681+
django.db.models.Case.allowed_default
676682
django.db.models.CharField.cast_db_type
677683
django.db.models.CharField.description
678684
django.db.models.CharField.formfield
@@ -691,6 +697,7 @@ django.db.models.Empty
691697
django.db.models.Exists.empty_result_set_value
692698
django.db.models.Exists.select_format
693699
django.db.models.Expression.identity
700+
django.db.models.ExpressionWrapper.allowed_default
694701
django.db.models.Field.__copy__
695702
django.db.models.Field.__deepcopy__
696703
django.db.models.Field.__ge__
@@ -751,6 +758,7 @@ django.db.models.ForeignObjectRel.get_extra_restriction
751758
django.db.models.ForeignObjectRel.identity
752759
django.db.models.ForeignObjectRel.path_infos
753760
django.db.models.Func.function
761+
django.db.models.Func.allowed_default
754762
django.db.models.GenericIPAddressField.formfield
755763
django.db.models.ImageField.__get__
756764
django.db.models.ImageField.attr_class
@@ -762,6 +770,7 @@ django.db.models.JSONField.formfield
762770
django.db.models.JSONField.get_transform
763771
django.db.models.Lookup.get_prep_lhs
764772
django.db.models.Lookup.lookup_name
773+
django.db.models.Lookup.allowed_default
765774
django.db.models.Lookup.output_field
766775
django.db.models.Lookup.relabeled_clone
767776
django.db.models.Lookup.resolve_expression
@@ -818,6 +827,7 @@ django.db.models.Value.empty_result_set_value
818827
django.db.models.Value.for_save
819828
django.db.models.Variance.__init__
820829
django.db.models.When.as_sql
830+
django.db.models.When.allowed_default
821831
django.db.models.Window.as_sql
822832
django.db.models.Window.as_sqlite
823833
django.db.models.aggregates.Aggregate.__init__
@@ -849,6 +859,11 @@ django.db.models.expressions.BaseExpression.prefix_references
849859
django.db.models.expressions.BaseExpression.replace_expressions
850860
django.db.models.expressions.BaseExpression.select_format
851861
django.db.models.expressions.Case.as_sql
862+
django.db.models.expressions.Case.allowed_default
863+
django.db.models.expressions.CombinedExpression.allowed_default
864+
django.db.models.expressions.ExpressionWrapper.allowed_default
865+
django.db.models.expressions.Func.allowed_default
866+
django.db.models.expressions.When.allowed_default
852867
django.db.models.expressions.Col.relabeled_clone
853868
django.db.models.expressions.Exists.empty_result_set_value
854869
django.db.models.expressions.Exists.select_format
@@ -1083,6 +1098,7 @@ django.db.models.lookups.FieldGetDbPrepValueIterableMixin.batch_process_rhs
10831098
django.db.models.lookups.FieldGetDbPrepValueIterableMixin.process_rhs
10841099
django.db.models.lookups.IExact.process_rhs
10851100
django.db.models.lookups.Lookup.get_prep_lhs
1101+
django.db.models.lookups.Lookup.allowed_default
10861102
django.db.models.lookups.Lookup.lookup_name
10871103
django.db.models.lookups.Lookup.output_field
10881104
django.db.models.lookups.Lookup.relabeled_clone

scripts/stubtest/allowlist_todo_django50.txt

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,9 @@
22
# Only discrepancies that appeared after Django 4.2 -> 5.0 update.
33
# Unsorted: there are real problems and things we can really ignore.
44

5-
django.contrib.gis.db.models.Case.allowed_default
6-
django.contrib.gis.db.models.ExpressionWrapper.allowed_default
7-
django.contrib.gis.db.models.F.allowed_default
85
django.contrib.gis.db.models.Field._get_flatchoices
96
django.contrib.gis.db.models.ForeignKey.cast_db_type
10-
django.contrib.gis.db.models.Func.allowed_default
11-
django.contrib.gis.db.models.Lookup.allowed_default
127
django.contrib.gis.db.models.Q.identity
13-
django.contrib.gis.db.models.When.allowed_default
148
django.contrib.gis.geos.prototypes.io.DEFAULT_TRIM_VALUE
159
django.contrib.gis.management
1610
django.contrib.gis.management.commands
@@ -27,24 +21,11 @@ django.db.backends.postgresql.features.DatabaseFeatures.supports_nulls_distinct_
2721
django.db.backends.postgresql.psycopg_any
2822
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_column_comment
2923
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_table_comment
30-
django.db.models.Case.allowed_default
31-
django.db.models.ExpressionWrapper.allowed_default
32-
django.db.models.F.allowed_default
3324
django.db.models.Field._get_flatchoices
3425
django.db.models.ForeignKey.cast_db_type
35-
django.db.models.Func.allowed_default
36-
django.db.models.Lookup.allowed_default
3726
django.db.models.Q.identity
38-
django.db.models.When.allowed_default
39-
django.db.models.expressions.Case.allowed_default
40-
django.db.models.expressions.CombinedExpression.allowed_default
41-
django.db.models.expressions.ExpressionWrapper.allowed_default
42-
django.db.models.expressions.F.allowed_default
43-
django.db.models.expressions.Func.allowed_default
44-
django.db.models.expressions.When.allowed_default
4527
django.db.models.fields.Field._get_flatchoices
4628
django.db.models.fields.related.ForeignKey.cast_db_type
47-
django.db.models.lookups.Lookup.allowed_default
4829
django.template.autoreload
4930

5031
# Django + Oracle (new errors after 5.0.5 update)

0 commit comments

Comments
 (0)