Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0: Update django.db.models.expressions #2176

Merged
merged 1 commit into from
May 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions django-stubs/db/models/expressions.pyi
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class TemporalSubtraction(CombinedExpression):

class F(_Deconstructible, Combinable):
name: str
allowed_default: ClassVar[bool]
def __init__(self, name: str) -> None: ...
def resolve_expression(
self,
Expand Down
16 changes: 16 additions & 0 deletions scripts/stubtest/allowlist_todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ django.contrib.gis.db.models.BigIntegerField.formfield
django.contrib.gis.db.models.BinaryField.get_placeholder
django.contrib.gis.db.models.BooleanField.formfield
django.contrib.gis.db.models.Case.as_sql
django.contrib.gis.db.models.Case.allowed_default
django.contrib.gis.db.models.CharField.cast_db_type
django.contrib.gis.db.models.CharField.description
django.contrib.gis.db.models.CharField.formfield
Expand All @@ -256,6 +257,7 @@ django.contrib.gis.db.models.Empty
django.contrib.gis.db.models.Exists.empty_result_set_value
django.contrib.gis.db.models.Exists.select_format
django.contrib.gis.db.models.Expression.identity
django.contrib.gis.db.models.ExpressionWrapper.allowed_default
django.contrib.gis.db.models.Extent.is_extent
django.contrib.gis.db.models.Extent3D.is_extent
django.contrib.gis.db.models.Field.__copy__
Expand Down Expand Up @@ -318,6 +320,7 @@ django.contrib.gis.db.models.ForeignObjectRel.get_extra_restriction
django.contrib.gis.db.models.ForeignObjectRel.identity
django.contrib.gis.db.models.ForeignObjectRel.path_infos
django.contrib.gis.db.models.Func.function
django.contrib.gis.db.models.Func.allowed_default
django.contrib.gis.db.models.GenericIPAddressField.formfield
django.contrib.gis.db.models.GeoAggregate
django.contrib.gis.db.models.GeometryField.contribute_to_class
Expand All @@ -330,6 +333,7 @@ django.contrib.gis.db.models.IntegerField.formfield
django.contrib.gis.db.models.JSONField.formfield
django.contrib.gis.db.models.JSONField.get_transform
django.contrib.gis.db.models.Lookup.get_prep_lhs
django.contrib.gis.db.models.Lookup.allowed_default
django.contrib.gis.db.models.Lookup.lookup_name
django.contrib.gis.db.models.Lookup.output_field
django.contrib.gis.db.models.Lookup.relabeled_clone
Expand Down Expand Up @@ -388,6 +392,7 @@ django.contrib.gis.db.models.Value.empty_result_set_value
django.contrib.gis.db.models.Value.for_save
django.contrib.gis.db.models.Variance.__init__
django.contrib.gis.db.models.When.as_sql
django.contrib.gis.db.models.When.allowed_default
django.contrib.gis.db.models.Window.as_sql
django.contrib.gis.db.models.Window.as_sqlite
django.contrib.gis.db.models.aggregates.Extent.is_extent
Expand Down Expand Up @@ -673,6 +678,7 @@ django.db.models.BigIntegerField.formfield
django.db.models.BinaryField.get_placeholder
django.db.models.BooleanField.formfield
django.db.models.Case.as_sql
django.db.models.Case.allowed_default
django.db.models.CharField.cast_db_type
django.db.models.CharField.description
django.db.models.CharField.formfield
Expand All @@ -691,6 +697,7 @@ django.db.models.Empty
django.db.models.Exists.empty_result_set_value
django.db.models.Exists.select_format
django.db.models.Expression.identity
django.db.models.ExpressionWrapper.allowed_default
django.db.models.Field.__copy__
django.db.models.Field.__deepcopy__
django.db.models.Field.__ge__
Expand Down Expand Up @@ -751,6 +758,7 @@ django.db.models.ForeignObjectRel.get_extra_restriction
django.db.models.ForeignObjectRel.identity
django.db.models.ForeignObjectRel.path_infos
django.db.models.Func.function
django.db.models.Func.allowed_default
django.db.models.GenericIPAddressField.formfield
django.db.models.ImageField.__get__
django.db.models.ImageField.attr_class
Expand All @@ -762,6 +770,7 @@ django.db.models.JSONField.formfield
django.db.models.JSONField.get_transform
django.db.models.Lookup.get_prep_lhs
django.db.models.Lookup.lookup_name
django.db.models.Lookup.allowed_default
django.db.models.Lookup.output_field
django.db.models.Lookup.relabeled_clone
django.db.models.Lookup.resolve_expression
Expand Down Expand Up @@ -818,6 +827,7 @@ django.db.models.Value.empty_result_set_value
django.db.models.Value.for_save
django.db.models.Variance.__init__
django.db.models.When.as_sql
django.db.models.When.allowed_default
django.db.models.Window.as_sql
django.db.models.Window.as_sqlite
django.db.models.aggregates.Aggregate.__init__
Expand Down Expand Up @@ -849,6 +859,11 @@ django.db.models.expressions.BaseExpression.prefix_references
django.db.models.expressions.BaseExpression.replace_expressions
django.db.models.expressions.BaseExpression.select_format
django.db.models.expressions.Case.as_sql
django.db.models.expressions.Case.allowed_default
django.db.models.expressions.CombinedExpression.allowed_default
django.db.models.expressions.ExpressionWrapper.allowed_default
django.db.models.expressions.Func.allowed_default
django.db.models.expressions.When.allowed_default
django.db.models.expressions.Col.relabeled_clone
django.db.models.expressions.Exists.empty_result_set_value
django.db.models.expressions.Exists.select_format
Expand Down Expand Up @@ -1083,6 +1098,7 @@ django.db.models.lookups.FieldGetDbPrepValueIterableMixin.batch_process_rhs
django.db.models.lookups.FieldGetDbPrepValueIterableMixin.process_rhs
django.db.models.lookups.IExact.process_rhs
django.db.models.lookups.Lookup.get_prep_lhs
django.db.models.lookups.Lookup.allowed_default
django.db.models.lookups.Lookup.lookup_name
django.db.models.lookups.Lookup.output_field
django.db.models.lookups.Lookup.relabeled_clone
Expand Down
19 changes: 0 additions & 19 deletions scripts/stubtest/allowlist_todo_django50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@
# Only discrepancies that appeared after Django 4.2 -> 5.0 update.
# Unsorted: there are real problems and things we can really ignore.

django.contrib.gis.db.models.Case.allowed_default
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.ForeignKey.cast_db_type
django.contrib.gis.db.models.Func.allowed_default
django.contrib.gis.db.models.Lookup.allowed_default
django.contrib.gis.db.models.Q.identity
django.contrib.gis.db.models.When.allowed_default
django.contrib.gis.geos.prototypes.io.DEFAULT_TRIM_VALUE
django.contrib.gis.management
django.contrib.gis.management.commands
Expand All @@ -27,24 +21,11 @@ django.db.backends.postgresql.features.DatabaseFeatures.supports_nulls_distinct_
django.db.backends.postgresql.psycopg_any
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_column_comment
django.db.backends.sqlite3.schema.DatabaseSchemaEditor.sql_alter_table_comment
django.db.models.Case.allowed_default
django.db.models.ExpressionWrapper.allowed_default
django.db.models.F.allowed_default
django.db.models.Field._get_flatchoices
django.db.models.ForeignKey.cast_db_type
django.db.models.Func.allowed_default
django.db.models.Lookup.allowed_default
django.db.models.Q.identity
django.db.models.When.allowed_default
django.db.models.expressions.Case.allowed_default
django.db.models.expressions.CombinedExpression.allowed_default
django.db.models.expressions.ExpressionWrapper.allowed_default
django.db.models.expressions.F.allowed_default
django.db.models.expressions.Func.allowed_default
django.db.models.expressions.When.allowed_default
django.db.models.fields.Field._get_flatchoices
django.db.models.fields.related.ForeignKey.cast_db_type
django.db.models.lookups.Lookup.allowed_default
django.template.autoreload

# Django + Oracle (new errors after 5.0.5 update)
Expand Down
Loading