github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Faceting no longer breaks pagination, fixes #282

Browse source
This commit is contained in:
Simon Willison 2018-05-23 06:41:14 -07:00
commit 2bfd111d65
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
datasette/views/table.py
View file

@ -556,7 +556,7 @@ class TableView(RowTableShared):
""".format( """.format(
col=escape_sqlite(column), col=escape_sqlite(column),
from_sql=from_sql, from_sql=from_sql,
and_or_where='and' if where_clause else 'where', and_or_where='and' if from_sql_where_clauses else 'where',
limit=facet_size+1, limit=facet_size+1,
) )
try: try:

9
tests/test_api.py
View file

@ -7,6 +7,7 @@ from .fixtures import (
METADATA, METADATA,
) )
import pytest import pytest
import urllib
pytest.fixture(scope='module')(app_client) pytest.fixture(scope='module')(app_client)
pytest.fixture(scope='module')(app_client_shorter_time_limit) pytest.fixture(scope='module')(app_client_shorter_time_limit)
@ -533,6 +534,8 @@ def test_table_with_reserved_word_name(app_client):
('/test_tables/paginated_view.json?_size=25', 201, 9), ('/test_tables/paginated_view.json?_size=25', 201, 9),
('/test_tables/paginated_view.json?_size=max', 201, 3), ('/test_tables/paginated_view.json?_size=max', 201, 3),
('/test_tables/123_starts_with_digits.json', 0, 1), ('/test_tables/123_starts_with_digits.json', 0, 1),
# Ensure faceting doesn't break pagination:
('/test_tables/compound_three_primary_keys.json?_facet=pk1', 1001, 21),
]) ])
def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pages): def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pages):
fetched = [] fetched = []
@ -545,8 +548,10 @@ def test_paginate_tables_and_views(app_client, path, expected_rows, expected_pag
path = response.json['next_url'] path = response.json['next_url']
if path: if path:
assert response.json['next'] assert response.json['next']
assert '_next={}'.format(response.json['next']) in path assert urllib.parse.urlencode({
assert count < 10, 'Possible infinite loop detected' '_next': response.json['next']
}) in path
assert count < 30, 'Possible infinite loop detected'
assert expected_rows == len(fetched) assert expected_rows == len(fetched)
assert expected_pages == count assert expected_pages == count