fix everything?

ormar/queryset/actions/order_action.py

@@ -46,9 +46,16 @@ class OrderAction(QueryAction):
         prefix = f"{self.table_prefix}_" if self.table_prefix else ""
         return f"{prefix}{self.table}" f".{self.field_alias}"
 
-    def get_min_or_max(self):
+    def get_min_or_max(self) -> sqlalchemy.sql.expression.TextClause:
+        """
+        Used in limit sub queries where you need to use aggregated functions
+        in order to order by columns not included in group by.
+
+        :return: min or max function to order
+        :rtype: sqlalchemy.sql.elements.TextClause
+        """
         prefix = f"{self.table_prefix}_" if self.table_prefix else ""
-        if self.direction == '':
+        if self.direction == "":
             return text(f"min({prefix}{self.table}" f".{self.field_alias})")
         else:
             return text(f"max({prefix}{self.table}" f".{self.field_alias}) desc")

ormar/queryset/query.py

@@ -153,9 +153,10 @@ class Query:
         return expr
 
     def _build_pagination_condition(
-            self
+        self,
     ) -> Tuple[
-        sqlalchemy.sql.expression.TextClause, sqlalchemy.sql.expression.TextClause]:
+        sqlalchemy.sql.expression.TextClause, sqlalchemy.sql.expression.TextClause
+    ]:
         """
         In order to apply limit and offset on main table in join only
         (otherwise you can get only partially constructed main model
@@ -183,10 +184,9 @@ class Query:
         limit_qry = sqlalchemy.sql.select([qry_text])
         limit_qry = limit_qry.select_from(self.select_from)
         limit_qry = FilterQuery(filter_clauses=self.filter_clauses).apply(limit_qry)
-        limit_qry = FilterQuery(filter_clauses=self.exclude_clauses,
+        limit_qry = FilterQuery(
-                                exclude=True).apply(
+            filter_clauses=self.exclude_clauses, exclude=True
-            limit_qry
+        ).apply(limit_qry)
-        )
         limit_qry = limit_qry.group_by(qry_text)
         for order_by in maxes.values():
             limit_qry = limit_qry.order_by(order_by)
@@ -194,7 +194,8 @@ class Query:
         limit_qry = OffsetQuery(query_offset=self.query_offset).apply(limit_qry)
         limit_qry = limit_qry.alias("limit_query")
         on_clause = sqlalchemy.text(
-            f"limit_query.{pk_alias}={self.table.name}.{pk_alias}")
+            f"limit_query.{pk_alias}={self.table.name}.{pk_alias}"
+        )
         return limit_qry, on_clause
 
     def _apply_expression_modifiers(

ormar/queryset/queryset.py

@@ -281,7 +281,7 @@ class QuerySet:
             limit_raw_sql=self.limit_sql_raw,
         )
         exp = qry.build_select_expression()
-        print("\n", exp.compile(compile_kwargs={"literal_binds": True}))
+        # print("\n", exp.compile(compile_kwargs={"literal_binds": True}))
         return exp
 
     def filter(  # noqa: A003

tests/test_or_filters.py

@@ -153,8 +153,7 @@ async def test_or_filters():
         assert books[0].title == "The Witcher"
 
         with pytest.raises(QueryDefinitionError):
-            await Book.objects.select_related("author").filter('wrong').all()
+            await Book.objects.select_related("author").filter("wrong").all()
-
 
 
 # TODO: Check / modify

tests/test_order_by.py

@@ -221,12 +221,15 @@ async def test_sort_order_on_related_model():
         assert owners[1].toys[1].name == "Toy 5"
         assert owners[1].name == "Hermes"
 
-        toys = await Toy.objects.select_related('owner').order_by(
+        toys = (
-            ['owner__name', 'name']).limit(
+            await Toy.objects.select_related("owner")
-            2).all()
+            .order_by(["owner__name", "name"])
+            .limit(2)
+            .all()
+        )
         assert len(toys) == 2
-        assert toys[0].name == 'Toy 2'
+        assert toys[0].name == "Toy 2"
-        assert toys[1].name == 'Toy 3'
+        assert toys[1].name == "Toy 3"
 
 
 @pytest.mark.asyncio