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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
May 2, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions django-stubs/db/models/expressions.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class BaseExpression:
is_summary: bool
filterable: bool
window_compatible: bool
allowed_default: bool
def __init__(self, output_field: Field | None = ...) -> None: ...
def get_db_converters(self, connection: BaseDatabaseWrapper) -> list[Callable]: ...
def get_source_expressions(self) -> list[Any]: ...
Expand Down Expand Up @@ -193,6 +194,7 @@ class RawSQL(Expression):
def __init__(self, sql: str, params: Sequence[Any], output_field: Field | None = ...) -> None: ...

class Star(Expression): ...
class DatabaseDefault(Expression): ...

class Col(Expression):
target: Field
Expand Down Expand Up @@ -237,6 +239,7 @@ class Case(Expression):

class Subquery(BaseExpression, Combinable):
template: str
subquery: bool
query: Query
extra: dict[Any, Any]
def __init__(self, queryset: Query | QuerySet, output_field: Field | None = ..., **extra: Any) -> None: ...
Expand Down
3 changes: 0 additions & 3 deletions scripts/stubtest/allowlist_todo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,6 @@ django.contrib.gis.db.models.Subquery.as_sql
django.contrib.gis.db.models.Subquery.empty_result_set_value
django.contrib.gis.db.models.Subquery.external_aliases
django.contrib.gis.db.models.Subquery.get_external_cols
django.contrib.gis.db.models.Subquery.subquery
django.contrib.gis.db.models.TextField.formfield
django.contrib.gis.db.models.TimeField.formfield
django.contrib.gis.db.models.URLField.formfield
Expand Down Expand Up @@ -835,7 +834,6 @@ django.db.models.Subquery.as_sql
django.db.models.Subquery.empty_result_set_value
django.db.models.Subquery.external_aliases
django.db.models.Subquery.get_external_cols
django.db.models.Subquery.subquery
django.db.models.TextField.formfield
django.db.models.TimeField.formfield
django.db.models.URLField.formfield
Expand Down Expand Up @@ -894,7 +892,6 @@ django.db.models.expressions.Subquery.as_sql
django.db.models.expressions.Subquery.empty_result_set_value
django.db.models.expressions.Subquery.external_aliases
django.db.models.expressions.Subquery.get_external_cols
django.db.models.expressions.Subquery.subquery
django.db.models.expressions.Value.empty_result_set_value
django.db.models.expressions.Value.for_save
django.db.models.expressions.When.as_sql
Expand Down
9 changes: 0 additions & 9 deletions scripts/stubtest/allowlist_todo_django50.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ django.contrib.gis.db.models.Func.allowed_default
django.contrib.gis.db.models.Lookup.allowed_default
django.contrib.gis.db.models.Prefetch.get_current_querysets
django.contrib.gis.db.models.Q.identity
django.contrib.gis.db.models.Value.allowed_default
django.contrib.gis.db.models.When.allowed_default
django.contrib.gis.forms.BaseForm._html_output
django.contrib.gis.forms.BoundField.get_context
Expand Down Expand Up @@ -89,18 +88,12 @@ django.db.models.Func.allowed_default
django.db.models.Lookup.allowed_default
django.db.models.Prefetch.get_current_querysets
django.db.models.Q.identity
django.db.models.Value.allowed_default
django.db.models.When.allowed_default
django.db.models.expressions.BaseExpression.allowed_default
django.db.models.expressions.Case.allowed_default
django.db.models.expressions.CombinedExpression.allowed_default
django.db.models.expressions.DatabaseDefault
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.OrderByList.allowed_default
django.db.models.expressions.RawSQL.allowed_default
django.db.models.expressions.Value.allowed_default
django.db.models.expressions.When.allowed_default
django.db.models.fields.Field._get_flatchoices
django.db.models.fields.Field.generated
Expand All @@ -113,9 +106,7 @@ django.db.models.fields.related.ReverseOneToOneDescriptor.get_prefetch_querysets
django.db.models.fields.related_descriptors.ForwardManyToOneDescriptor.get_prefetch_querysets
django.db.models.fields.related_descriptors.ReverseOneToOneDescriptor.get_prefetch_querysets
django.db.models.fields.reverse_related.ForeignObjectRel.get_joining_fields
django.db.models.functions.Collate.allowed_default
django.db.models.functions.Now.as_oracle
django.db.models.functions.comparison.Collate.allowed_default
django.db.models.functions.datetime.Now.as_oracle
django.db.models.lookups.Lookup.allowed_default
django.db.models.query.Prefetch.get_current_querysets
Expand Down
Loading