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

Improved error handling

Browse source 
Invalid SQL now shows a special error.html template, and is covered by tests.
This commit is contained in:
Simon Willison 2017-11-12 13:16:15 -08:00
commit 666aa03253
4 changed files with 53 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tests/test_app.py
View file

@ -6,7 +6,7 @@ import tempfile
@pytest.fixture(scope='module')
def three_table_app_client():
def app_client():
with tempfile.TemporaryDirectory() as tmpdir:
filepath = os.path.join(tmpdir, 'four_tables.db')
conn = sqlite3.connect(filepath)
@ -15,13 +15,13 @@ def three_table_app_client():
yield Datasette([filepath]).app().test_client
def test_homepage(three_table_app_client):
_, response = three_table_app_client.get('/')
def test_homepage(app_client):
_, response = app_client.get('/')
assert response.status == 200
assert 'four_tables' in response.text
# Now try the JSON
_, response = three_table_app_client.get('/.json')
_, response = app_client.get('/.json')
assert response.status == 200
assert response.json.keys() == {'four_tables': 0}.keys()
d = response.json['four_tables']
@ -29,13 +29,13 @@ def test_homepage(three_table_app_client):
assert d['tables_count'] == 4
def test_database_page(three_table_app_client):
_, response = three_table_app_client.get('/four_tables', allow_redirects=False)
def test_database_page(app_client):
_, response = app_client.get('/four_tables', allow_redirects=False)
assert response.status == 302
_, response = three_table_app_client.get('/four_tables')
_, response = app_client.get('/four_tables')
assert 'four_tables' in response.text
# Test JSON list of tables
_, response = three_table_app_client.get('/four_tables.json')
_, response = app_client.get('/four_tables.json')
data = response.json
assert 'four_tables' == data['database']
assert [{
@ -57,8 +57,8 @@ def test_database_page(three_table_app_client):
}] == data['tables']
def test_custom_sql(three_table_app_client):
_, response = three_table_app_client.get(
def test_custom_sql(app_client):
_, response = app_client.get(
'/four_tables.jsono?sql=select+content+from+simple_primary_key'
)
data = response.json
@ -74,10 +74,24 @@ def test_custom_sql(three_table_app_client):
assert 'four_tables' == data['database']
def test_table_page(three_table_app_client):
_, response = three_table_app_client.get('/four_tables/simple_primary_key')
def test_invalid_custom_sql(app_client):
_, response = app_client.get(
'/four_tables?sql=.schema'
)
assert response.status == 400
assert 'Statement must begin with SELECT' in response.text
_, response = app_client.get(
'/four_tables.json?sql=.schema'
)
assert response.status == 400
assert response.json['ok'] is False
assert 'Statement must begin with SELECT' == response.json['error']
def test_table_page(app_client):
_, response = app_client.get('/four_tables/simple_primary_key')
assert response.status == 200
_, response = three_table_app_client.get('/four_tables/simple_primary_key.jsono')
_, response = app_client.get('/four_tables/simple_primary_key.jsono')
assert response.status == 200
data = response.json
assert data['query']['sql'] == 'select * from "simple_primary_key" order by pk limit 51'
@ -91,10 +105,10 @@ def test_table_page(three_table_app_client):
}]
def test_view(three_table_app_client):
_, response = three_table_app_client.get('/four_tables/simple_view')
def test_view(app_client):
_, response = app_client.get('/four_tables/simple_view')
assert response.status == 200
_, response = three_table_app_client.get('/four_tables/simple_view.jsono')
_, response = app_client.get('/four_tables/simple_view.jsono')
assert response.status == 200
data = response.json
assert data['rows'] == [{