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

.csv now links to .blob downloads

Browse source 
Closes #1063, closes #1034
This commit is contained in:
Simon Willison 2020-10-29 15:47:32 -07:00
commit 178b7e8749
4 changed files with 65 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tests/test_csv.py
View file

@ -1,5 +1,3 @@
import textwrap
import pytest
from .fixtures import ( # noqa
app_client,
app_client_csv_max_mb_one,
@ -80,19 +78,27 @@ def test_table_csv_with_nullable_labels(app_client):
assert EXPECTED_TABLE_WITH_NULLABLE_LABELS_CSV == response.text
@pytest.mark.xfail
def test_table_csv_blob_columns(app_client):
response = app_client.get("/fixtures/binary_data.csv")
assert response.status == 200
assert "text/plain; charset=utf-8" == response.headers["content-type"]
assert EXPECTED_TABLE_CSV == textwrap.dedent(
"""
rowid,data
1,/fixtures/binary_data/-/blob/1/data.blob
2,/fixtures/binary_data/-/blob/1/data.blob
""".strip().replace(
"\n", "\r\n"
)
assert response.text == (
"rowid,data\r\n"
"1,http://localhost/fixtures/binary_data/1.blob?_blob_column=data\r\n"
"2,http://localhost/fixtures/binary_data/2.blob?_blob_column=data\r\n"
"3,\r\n"
)
def test_custom_sql_csv_blob_columns(app_client):
response = app_client.get("/fixtures.csv?sql=select+rowid,+data+from+binary_data")
assert response.status == 200
assert "text/plain; charset=utf-8" == response.headers["content-type"]
assert response.text == (
"rowid,data\r\n"
'1,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_blob_column=data&_blob_hash=f3088978da8f9aea479ffc7f631370b968d2e855eeb172bea7f6c7a04262bb6d"\r\n'
'2,"http://localhost/fixtures.blob?sql=select+rowid,+data+from+binary_data&_blob_column=data&_blob_hash=b835b0483cedb86130b9a2c280880bf5fadc5318ddf8c18d0df5204d40df1724"\r\n'
"3,\r\n"
)

8
tests/test_utils.py
View file

@ -386,6 +386,14 @@ def test_path_with_format(path, format, extra_qs, expected):
assert expected == actual
def test_path_with_format_replace_format():
request = Request.fake("/foo/bar.csv")
assert utils.path_with_format(request, "blob") == "/foo/bar.csv?_format=blob"
assert (
utils.path_with_format(request, "blob", replace_format="csv") == "/foo/bar.blob"
)
@pytest.mark.parametrize(
"bytes,expected",
[