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

Support _search_COLUMN=text searches, closes #237

Browse source
This commit is contained in:
Simon Willison 2018-05-05 19:33:08 -03:00
commit 1259b8ac0b
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
5 changed files with 78 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tests/fixtures.py
View file

@ -248,16 +248,17 @@ INSERT INTO units VALUES (3, 100000, 75000);
CREATE TABLE searchable (
pk integer primary key,
text1 text,
text2 text
text2 text,
[name with . and spaces] text
);
INSERT INTO searchable VALUES (1, 'barry cat', 'john dog');
INSERT INTO searchable VALUES (2, 'terry cat', 'john weasel');
INSERT INTO searchable VALUES (1, 'barry cat', 'terry dog', 'panther');
INSERT INTO searchable VALUES (2, 'terry dog', 'sara weasel', 'puma');
CREATE VIRTUAL TABLE "searchable_fts"
USING FTS3 (text1, text2, content="searchable");
INSERT INTO "searchable_fts" (rowid, text1, text2)
SELECT rowid, text1, text2 FROM searchable;
USING FTS3 (text1, text2, [name with . and spaces], content="searchable");
INSERT INTO "searchable_fts" (rowid, text1, text2, [name with . and spaces])
SELECT rowid, text1, text2, [name with . and spaces] FROM searchable;
CREATE TABLE [select] (
[group] text,

34
tests/test_api.py
View file

@ -157,7 +157,7 @@ def test_database_page(app_client):
'fts_table': None,
'primary_keys': ['id']
}, {
'columns': ['pk', 'text1', 'text2'],
'columns': ['pk', 'text1', 'text2', 'name with . and spaces'],
'name': 'searchable',
'count': 2,
'foreign_keys': {'incoming': [], 'outgoing': []},
@ -242,7 +242,7 @@ def test_database_page(app_client):
'fts_table': None,
'primary_keys': [],
}, {
'columns': ['text1', 'text2', 'content'],
'columns': ['text1', 'text2', 'name with . and spaces', 'content'],
'count': 2,
'foreign_keys': {'incoming': [], 'outgoing': []},
'fts_table': 'searchable_fts',
@ -251,7 +251,7 @@ def test_database_page(app_client):
'name': 'searchable_fts',
'primary_keys': []
}, {
'columns': ['docid', 'c0text1', 'c1text2', 'c2content'],
'columns': ['docid', 'c0text1', 'c1text2', 'c2name with . and spaces', 'c3content'],
'count': 2,
'foreign_keys': {'incoming': [], 'outgoing': []},
'fts_table': None,
@ -681,12 +681,18 @@ def test_sortable_columns_metadata(app_client):
@pytest.mark.parametrize('path,expected_rows', [
('/test_tables/searchable.json?_search=cat', [
[1, 'barry cat', 'john dog'],
[2, 'terry cat', 'john weasel'],
('/test_tables/searchable.json?_search=dog', [
[1, 'barry cat', 'terry dog', 'panther'],
[2, 'terry dog', 'sara weasel', 'puma'],
]),
('/test_tables/searchable.json?_search=weasel', [
[2, 'terry cat', 'john weasel'],
[2, 'terry dog', 'sara weasel', 'puma'],
]),
('/test_tables/searchable.json?_search_text2=dog', [
[1, 'barry cat', 'terry dog', 'panther'],
]),
('/test_tables/searchable.json?_search_name%20with%20.%20and%20spaces=panther', [
[1, 'barry cat', 'terry dog', 'panther'],
]),
])
def test_searchable(app_client, path, expected_rows):
@ -694,6 +700,20 @@ def test_searchable(app_client, path, expected_rows):
assert expected_rows == response.json['rows']
def test_searchable_invalid_column(app_client):
response = app_client.get(
'/test_tables/searchable.json?_search_invalid=x',
gather_request=False
)
assert 400 == response.status
assert {
'ok': False,
'error': 'Cannot search by that column',
'status': 400,
'title': None
} == response.json
@pytest.mark.parametrize('path,expected_rows', [
('/test_tables/simple_primary_key.json?content=hello', [
['1', 'hello'],