Skip to content

Refactor pagination to handle grouped queries correctly. #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
soltanipoor merged 1 commit into from
Sep 23, 2025
Merged

Refactor pagination to handle grouped queries correctly. #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/basalam/backbone_orm/pagination.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from .repository_abstract import RepositoryAbstract
from .parameters import Parameters
from pydantic import ConfigDict, BaseModel, Field
from pypika import functions
from pypika import functions, Query
from pypika.queries import QueryBuilder


Expand Down Expand Up @@ -45,9 +45,14 @@ async def make(

if aggregate_query is None:
aggregate_query = query.__copy__()
aggregate_query._selects = []
aggregate_query._orderbys = []
aggregate_query = aggregate_query.select(functions.Count('*').as_('total'))
if query._groupbys:
aggregate_query._limit = None
aggregate_query._offset = None
aggregate_query = Query.from_(aggregate_query).select(functions.Count('*').as_('total'))
else:
aggregate_query._selects = []
aggregate_query = aggregate_query.select(functions.Count('*').as_('total'))

aggregations = (await (cls.repo()).execute_and_fetch(query=aggregate_query, params=params))

Expand Down