Skip to content

Commit 8035625

Browse files
committed
Consolidate per_page and items_per_page
1 parent 7fee8e4 commit 8035625

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

sqlalchemy_bind_manager/_repository/async_.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ async def cursor_paginated_find(
213213
find_stmt,
214214
cursor_reference=cursor_reference,
215215
is_before_cursor=is_before_cursor,
216-
per_page=items_per_page,
216+
items_per_page=items_per_page,
217217
)
218218

219219
async with self._get_session() as session:

sqlalchemy_bind_manager/_repository/base_repository.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,24 +148,24 @@ def _paginate_query_by_page(
148148
self,
149149
stmt: Select,
150150
page: int,
151-
per_page: int,
151+
items_per_page: int,
152152
) -> Select:
153153
"""Build the query offset and limit clauses from submitted parameters.
154154
155155
:param stmt: a Select statement
156156
:type stmt: Select
157157
:param page: Number of models to skip
158158
:type page: int
159-
:param per_page: Number of models to retrieve
160-
:type per_page: int
159+
:param items_per_page: Number of models to retrieve
160+
:type items_per_page: int
161161
:return: The filtered query
162162
"""
163163

164-
_offset = max((page - 1) * per_page, 0)
164+
_offset = max((page - 1) * items_per_page, 0)
165165
if _offset > 0:
166166
stmt = stmt.offset(_offset)
167167

168-
_limit = self._sanitised_query_limit(per_page)
168+
_limit = self._sanitised_query_limit(items_per_page)
169169
stmt = stmt.limit(_limit)
170170

171171
return stmt
@@ -175,7 +175,7 @@ def _cursor_paginated_query(
175175
stmt: Select,
176176
cursor_reference: Union[CursorReference, None],
177177
is_before_cursor: bool = False,
178-
per_page: int = _max_query_limit,
178+
items_per_page: int = _max_query_limit,
179179
) -> Select:
180180
"""Build the query offset and limit clauses from submitted parameters.
181181
@@ -185,12 +185,12 @@ def _cursor_paginated_query(
185185
:type before: Union[int, str]
186186
:param after: Identifier of the last node to skip
187187
:type after: Union[int, str]
188-
:param per_page: Number of models to retrieve
189-
:type per_page: int
188+
:param items_per_page: Number of models to retrieve
189+
:type items_per_page: int
190190
:return: The filtered query
191191
"""
192192

193-
forward_limit = self._sanitised_query_limit(per_page) + 1
193+
forward_limit = self._sanitised_query_limit(items_per_page) + 1
194194

195195
if not cursor_reference:
196196
return stmt.limit(forward_limit).order_by( # type: ignore

sqlalchemy_bind_manager/_repository/sync.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def cursor_paginated_find(
202202
find_stmt,
203203
cursor_reference=cursor_reference,
204204
is_before_cursor=is_before_cursor,
205-
per_page=items_per_page,
205+
items_per_page=items_per_page,
206206
)
207207

208208
with self._get_session() as session:

0 commit comments

Comments
 (0)