fix: TypeError when sorting by a RawSQL (#1788)

tortoise · Nov 25, 2024 · 1e9ba4f · 1e9ba4f
1 parent 3d18d03
commit 1e9ba4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/tests/test_queryset.py b/tests/test_queryset.py
@@ -575,6 +575,11 @@ async def test_annotate_order_expression(self):
         )
         self.assertEqual(data[0] + 1, data[1])
 
+    async def test_annotate_order_rawsql(self):
+        qs = IntFields.annotate(idp=RawSQL("id+1")).order_by("-idp")
+        data = await qs.first().values_list("id", "idp")
+        self.assertEqual(data[0] + 1, data[1])
+
     async def test_annotate_expression_filter(self):
         count = await IntFields.annotate(intnum1=F("intnum") + 1).filter(intnum1__gt=30).count()
         self.assertEqual(count, 23)

diff --git a/tortoise/queryset.py b/tortoise/queryset.py
@@ -230,7 +230,7 @@ def resolve_ordering(
                 )
             elif field_name in annotations:
                 if isinstance(annotation := annotations[field_name], Term):
-                    term = annotations
+                    term: Term = annotation
                 else:
                     annotation_info = annotation.resolve(
                         ResolveContext(