Skip to content

Commit 63d4342

Browse files
adamchainzsobolevnflaeppe
authored
Fix Func.function (#2529)
Co-authored-by: sobolevn <mail@sobolevn.me> Co-authored-by: Petter Friberg <petter_friberg@hotmail.com>
1 parent 300aa7a commit 63d4342

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ from django.utils.functional import cached_property
1111
NUMERIC_TYPES: Any
1212

1313
class GeoFuncMixin:
14+
function: str | None = None
1415
geom_param_pos: Any
1516
@property
1617
def geo_field(self) -> Any: ...

django-stubs/db/models/expressions.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ class OuterRef(F):
181181
def relabeled_clone(self, relabels: Any) -> Self: ...
182182

183183
class Func(SQLiteNumericMixin, Expression):
184-
function: str
184+
function: str | None = None
185185
name: str
186186
template: str
187187
arg_joiner: str

scripts/stubtest/allowlist_todo.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ django.contrib.gis.db.models.ForeignObjectRel.empty_strings_allowed
292292
django.contrib.gis.db.models.ForeignObjectRel.get_extra_restriction
293293
django.contrib.gis.db.models.ForeignObjectRel.identity
294294
django.contrib.gis.db.models.ForeignObjectRel.path_infos
295-
django.contrib.gis.db.models.Func.function
296295
django.contrib.gis.db.models.Func.allowed_default
297296
django.contrib.gis.db.models.GenericIPAddressField.formfield
298297
django.contrib.gis.db.models.GeoAggregate
@@ -359,13 +358,11 @@ django.contrib.gis.db.models.Window.as_sqlite
359358
django.contrib.gis.db.models.aggregates.Extent.is_extent
360359
django.contrib.gis.db.models.aggregates.Extent3D.is_extent
361360
django.contrib.gis.db.models.aggregates.GeoAggregate.as_sql
362-
django.contrib.gis.db.models.aggregates.GeoAggregate.function
363361
django.contrib.gis.db.models.fields.GeometryField.contribute_to_class
364362
django.contrib.gis.db.models.fields.RasterField.contribute_to_class
365363
django.contrib.gis.db.models.functions.Area.as_sql
366364
django.contrib.gis.db.models.functions.GeoFuncMixin.__init__
367365
django.contrib.gis.db.models.functions.GeoFuncMixin.as_sql
368-
django.contrib.gis.db.models.functions.GeoFuncMixin.function
369366
django.contrib.gis.db.models.functions.GeoFuncMixin.name
370367
django.contrib.gis.db.models.functions.GeoFuncMixin.resolve_expression
371368
django.contrib.gis.db.models.functions.Length.as_sql
@@ -693,7 +690,6 @@ django.db.models.ForeignObjectRel.empty_strings_allowed
693690
django.db.models.ForeignObjectRel.get_extra_restriction
694691
django.db.models.ForeignObjectRel.identity
695692
django.db.models.ForeignObjectRel.path_infos
696-
django.db.models.Func.function
697693
django.db.models.Func.allowed_default
698694
django.db.models.GenericIPAddressField.formfield
699695
django.db.models.ImageField.__get__
@@ -789,7 +785,6 @@ django.db.models.expressions.When.allowed_default
789785
django.db.models.expressions.Col.relabeled_clone
790786
django.db.models.expressions.Exists.empty_result_set_value
791787
django.db.models.expressions.Expression.identity
792-
django.db.models.expressions.Func.function
793788
django.db.models.expressions.OrderBy.as_oracle
794789
django.db.models.expressions.OrderBy.as_sql
795790
django.db.models.expressions.Ref.get_refs
@@ -954,7 +949,6 @@ django.db.models.functions.Coalesce.as_oracle
954949
django.db.models.functions.Coalesce.empty_result_set_value
955950
django.db.models.functions.Collate.as_sql
956951
django.db.models.functions.Collate.collation_re
957-
django.db.models.functions.Concat.function
958952
django.db.models.functions.ConcatPair.as_postgresql
959953
django.db.models.functions.Cot.as_oracle
960954
django.db.models.functions.Degrees.as_oracle
@@ -997,7 +991,6 @@ django.db.models.functions.math.Random.as_oracle
997991
django.db.models.functions.mixins.FixDecimalInputMixin.as_postgresql
998992
django.db.models.functions.mixins.FixDurationInputMixin.as_mysql
999993
django.db.models.functions.mixins.FixDurationInputMixin.as_oracle
1000-
django.db.models.functions.text.Concat.function
1001994
django.db.models.functions.text.ConcatPair.as_postgresql
1002995
django.db.models.indexes.IndexExpression.wrapper_classes
1003996
django.db.models.lookups.FieldGetDbPrepValueIterableMixin.batch_process_rhs

0 commit comments

Comments
 (0)