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

fts_table and fts_pk metadata configs, available for both tables and views

Browse source
This commit is contained in:
Simon Willison 2018-08-05 17:44:47 -07:00
commit 7d0299edd4
No known key found for this signature in database
GPG key ID: 17E2DEA2588B7F52
2 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
datasette/views/table.py
View file

@ -309,7 +309,10 @@ class TableView(RowTableShared):
where_clauses, params = filters.build_where_clauses()
# _search support:
fts_table = info[name]["tables"].get(table, {}).get("fts_table")
fts_table = table_metadata.get(
"fts_table", info[name]["tables"].get(table, {}).get("fts_table")
)
fts_pk = table_metadata.get("fts_pk", "rowid")
search_args = dict(
pair for pair in special_args.items() if pair[0].startswith("_search")
)
@ -320,8 +323,9 @@ class TableView(RowTableShared):
# Simple ?_search=xxx
search = search_args["_search"]
where_clauses.append(
"rowid in (select rowid from {fts_table} where {fts_table} match :search)".format(
"{fts_pk} in (select rowid from {fts_table} where {fts_table} match :search)".format(
fts_table=escape_sqlite(fts_table),
fts_pk=escape_sqlite(fts_pk)
)
)
search_descriptions.append('search matches "{}"'.format(search))