Skip to content

feat: Correct Pagination Bug #12

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

Open
Eliasmgprado wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Correct Pagination Bug #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9d6e0b
feat: Correct Pagination Bug
Eliasmgprado Jul 21, 2021
ef9a84d
Correcting Prev Commit
Eliasmgprado Feb 1, 2022
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
17 changes: 12 additions & 5 deletions flask_whooshalchemy/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,23 @@ def __iter__(self):
if self._whoosh_results is None or self._order_by is not False:
return _iter

super_rows = list(_iter) # Correcting Pagination BUG

ordered = []

for row in _iter:
# for row in _iter: # Correcting Pagination BUG
for row in super_rows: # Correcting Pagination BUG
# we have to convert the primary-key, as stored in the SQL database
# into a string because the key is stored as an `ID` in whoosh.
# The ID field is string only; plus, this allows for uuid pk's.
str_pk = str(getattr(row, self._pk))
heapq.heappush(
ordered, (self._whoosh_results[str_pk], row))

if hasattr(row, self._pk): # Correcting Pagination BUG
str_pk = str(getattr(row, self._pk))
heapq.heappush(
ordered, (self._whoosh_results[str_pk], row))
else: # Correcting Pagination BUG
# PK column not found in result row # Correcting Pagination BUG
return iter(super_rows) # Correcting Pagination BUG

def inner():
while ordered:
yield heapq.heappop(ordered)[1]
Expand Down