Fix order_by to accept any Combinable (#2816)

Author: sobolevn

django-stubs/db/models/manager.pyi

@@ -143,7 +143,7 @@ class Manager(BaseManager[_T]):
     def prefetch_related(self, *lookups: str | Prefetch[_LookupT, _PrefetchedQuerySetT, _ToAttrT]) -> QuerySet[_T]: ...
     def annotate(self, *args: Any, **kwargs: Any) -> QuerySet[_T]: ...
     def alias(self, *args: Any, **kwargs: Any) -> QuerySet[_T]: ...
-    def order_by(self, *field_names: str | OrderBy) -> QuerySet[_T]: ...
+    def order_by(self, *field_names: str | Combinable) -> QuerySet[_T]: ...
     def distinct(self, *field_names: str) -> QuerySet[_T]: ...
     # extra() return type won't be supported any time soon
     def extra(

django-stubs/db/models/query.pyi

@@ -189,7 +189,7 @@ class QuerySet(Generic[_Model, _Row], Iterable[_Row], Sized):
     def prefetch_related(self, *lookups: str | Prefetch[_LookupT, _PrefetchedQuerySetT, _ToAttrT]) -> Self: ...
     def annotate(self, *args: Any, **kwargs: Any) -> Self: ...
     def alias(self, *args: Any, **kwargs: Any) -> Self: ...
-    def order_by(self, *field_names: str | OrderBy) -> Self: ...
+    def order_by(self, *field_names: str | Combinable) -> Self: ...
     def distinct(self, *field_names: str) -> Self: ...
     # extra() return type won't be supported any time soon
     def extra(

tests/typecheck/managers/querysets/test_from_queryset.yml

@@ -673,7 +673,7 @@
         reveal_type(MyModel.objects.intersection)  # N: Revealed type is "def (*other_qs: django.db.models.query.QuerySet[django.db.models.base.Model, django.db.models.base.Model]) -> myapp.models.MyQuerySet"
         reveal_type(MyModel.objects.none)  # N: Revealed type is "def () -> myapp.models.MyQuerySet"
         reveal_type(MyModel.objects.only)  # N: Revealed type is "def (*fields: builtins.str) -> myapp.models.MyQuerySet"
-        reveal_type(MyModel.objects.order_by)  # N: Revealed type is "def (*field_names: builtins.str | django.db.models.expressions.OrderBy) -> myapp.models.MyQuerySet"
+        reveal_type(MyModel.objects.order_by)  # N: Revealed type is "def (*field_names: builtins.str | django.db.models.expressions.Combinable) -> myapp.models.MyQuerySet"
         reveal_type(MyModel.objects.prefetch_related)  # N: Revealed type is "Overload(def (None) -> myapp.models.MyQuerySet, def (*lookups: builtins.str | django.db.models.query.Prefetch[_LookupT`-1, _PrefetchedQuerySetT`-2 = django.db.models.query.QuerySet[django.db.models.base.Model, django.db.models.base.Model], _ToAttrT`-3 = builtins.str]) -> myapp.models.MyQuerySet)"
         reveal_type(MyModel.objects.reverse)  # N: Revealed type is "def () -> myapp.models.MyQuerySet"
         reveal_type(MyModel.objects.select_for_update)  # N: Revealed type is "def (nowait: builtins.bool =, skip_locked: builtins.bool =, of: typing.Sequence[builtins.str] =, no_key: builtins.bool =) -> myapp.models.MyQuerySet"