Prodream/ormar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#453 make first and get respect user ordering if set on main model

Browse Source
This commit is contained in:
collerek
2021-12-16 17:24:23 +01:00
parent bc5c6222b1
commit 1b9a59b49d
6 changed files with 429 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
ormar/queryset/queryset.py
View File

@ -873,12 +873,16 @@ class QuerySet(Generic[T]):
expr = self.build_select_expression(
limit=1,
order_bys=[
OrderAction(
order_str=f"{self.model.Meta.pkname}",
model_cls=self.model_cls, # type: ignore
)
]
order_bys=(
[
OrderAction(
order_str=f"{self.model.Meta.pkname}",
model_cls=self.model_cls, # type: ignore
)
]
if not any([x.is_source_model_order for x in self.order_bys])
else []
)
+ self.order_bys,
)
rows = await self.database.fetch_all(expr)
@ -931,12 +935,16 @@ class QuerySet(Generic[T]):
if not self.filter_clauses:
expr = self.build_select_expression(
limit=1,
order_bys=[
OrderAction(
order_str=f"-{self.model.Meta.pkname}",
model_cls=self.model_cls, # type: ignore
)
]
order_bys=(
[
OrderAction(
order_str=f"-{self.model.Meta.pkname}",
model_cls=self.model_cls, # type: ignore
)
]
if not any([x.is_source_model_order for x in self.order_bys])
else []
)
+ self.order_bys,
)
else: