Update database expressions for Django 5.1 (#2563)

From django/django@f030236:

* `django.db.models.expressions.BaseExpression.constraint_validation_compatible` added
* `django.db.models.expressions.BaseExpression.get_expression_for_validation` added

From django/django@6364b6e:

* `django.db.models.functions.text.ConcatPair.pipes_concat_sql` added

From django/django@10b31ee:

* `django.contrib.gis.db.models.functions.FromWKB.__init__` added
* `django.contrib.gis.db.models.functions.FromWKB.as_oracle` added
* `django.contrib.gis.db.models.functions.FromWKB.output_field` removed
* `FromWKT` now inherits from `FromWKB`

Author: adamchainz

django-stubs/contrib/gis/db/models/functions.pyi

@@ -5,6 +5,7 @@ from django.contrib.gis.db.models.sql.conversion import AreaField, DistanceField
 from django.db.backends.base.base import BaseDatabaseWrapper
 from django.db.models import BinaryField, BooleanField, FloatField, Func, IntegerField, TextField
 from django.db.models import Transform as StandardTransform
+from django.db.models.expressions import BaseExpression
 from django.db.models.sql.compiler import SQLCompiler, _AsSqlType
 from django.utils.functional import cached_property
 
@@ -105,12 +106,11 @@ class ForcePolygonCW(GeomOutputGeoFunc):
     arity: int
 
 class FromWKB(GeoFunc):
-    output_field: ClassVar[GeometryField]
     arity: int
+    def __init__(self, expression: BaseExpression, srid: int = 0, **extra: Any) -> None: ...
+    def as_oracle(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, **extra_context: Any) -> _AsSqlType: ...
 
-class FromWKT(GeoFunc):
-    output_field: ClassVar[GeometryField]
-    arity: int
+class FromWKT(FromWKB): ...
 
 class GeoHash(GeoFunc):
     output_field: ClassVar[TextField]

django-stubs/db/models/expressions.pyi

@@ -63,10 +63,12 @@ class BaseExpression:
     filterable: bool
     window_compatible: bool
     allowed_default: bool
+    constraint_validation_compatible: bool
     def __init__(self, output_field: Field | None = None) -> None: ...
     def get_db_converters(self, connection: BaseDatabaseWrapper) -> list[Callable]: ...
     def get_source_expressions(self) -> list[Any]: ...
     def set_source_expressions(self, exprs: Sequence[Combinable | Expression]) -> None: ...
+    def as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
     @cached_property
     def contains_aggregate(self) -> bool: ...
     @cached_property
@@ -113,7 +115,7 @@ class BaseExpression:
     def reverse_ordering(self) -> BaseExpression: ...
     def flatten(self) -> Iterator[BaseExpression]: ...
     def select_format(self, compiler: SQLCompiler, sql: str, params: _ParamsT) -> _AsSqlType: ...
-    def as_sql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper) -> _AsSqlType: ...
+    def get_expression_for_validation(self) -> BaseExpression: ...
 
 class Expression(_Deconstructible, BaseExpression, Combinable): ...
 

django-stubs/db/models/functions/text.pyi

@@ -24,7 +24,10 @@ class Chr(Transform):
 
 class ConcatPair(Func):
     def coalesce(self) -> ConcatPair: ...
-    def as_sqlite(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, **extra_context: Any) -> _AsSqlType: ...
+    def pipes_concat_sql(
+        self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, **extra_context: Any
+    ) -> _AsSqlType: ...
+    as_sqlite = pipes_concat_sql
     def as_mysql(self, compiler: SQLCompiler, connection: BaseDatabaseWrapper, **extra_context: Any) -> _AsSqlType: ...
 
 class Concat(Func):

scripts/stubtest/allowlist_todo_django51.txt

@@ -7,11 +7,6 @@ django.contrib.contenttypes.fields.GenericForeignKey.get_attname_column
 django.contrib.contenttypes.models.ContentType.get_object_for_this_type
 django.contrib.gis.db.backends.mysql.operations.MySQLOperations.collect
 django.contrib.gis.db.models.ForeignObjectRel.accessor_name
-django.contrib.gis.db.models.OrderBy.constraint_validation_compatible
-django.contrib.gis.db.models.functions.FromWKB.__init__
-django.contrib.gis.db.models.functions.FromWKB.as_oracle
-django.contrib.gis.db.models.functions.FromWKB.output_field
-django.contrib.gis.db.models.functions.FromWKT.output_field
 django.contrib.gis.forms.ModelChoiceField.validate_no_null_characters
 django.contrib.gis.forms.RadioSelect.__slotnames__
 django.contrib.gis.gdal.geometries.LineString.m
@@ -44,7 +39,6 @@ django.contrib.postgres.aggregates.general.JSONBAgg.__init__
 django.contrib.postgres.fields.CIText
 django.contrib.postgres.fields.citext.CIText
 django.contrib.postgres.indexes.BTreeIndex.__init__
-django.contrib.postgres.indexes.OpClass.constraint_validation_compatible
 django.core.signing.Signer.__init__
 django.db.backends.base.operations.BaseDatabaseOperations.bulk_insert_sql
 django.db.backends.base.operations.BaseDatabaseOperations.force_group_by
@@ -66,14 +60,8 @@ django.db.backends.sqlite3.operations.DatabaseOperations.force_group_by
 django.db.migrations.autodetector.MigrationAutodetector.generate_altered_index_together
 django.db.migrations.autodetector.OperationDependency
 django.db.models.ForeignObjectRel.accessor_name
-django.db.models.OrderBy.constraint_validation_compatible
-django.db.models.expressions.BaseExpression.constraint_validation_compatible
-django.db.models.expressions.BaseExpression.get_expression_for_validation
-django.db.models.expressions.OrderBy.constraint_validation_compatible
 django.db.models.fields.related.ForeignObjectRel.accessor_name
 django.db.models.fields.reverse_related.ForeignObjectRel.accessor_name
-django.db.models.functions.ConcatPair.pipes_concat_sql
-django.db.models.functions.text.ConcatPair.pipes_concat_sql
 django.db.models.lookups.In.get_refs
 django.forms.ModelChoiceField.validate_no_null_characters
 django.forms.RadioSelect.__slotnames__