search_sql() returns most relevant first, not least

Refs #192
This commit is contained in:
Simon Willison 2020-11-06 15:50:02 -08:00
commit 771bd81b62
4 changed files with 4 additions and 4 deletions

View file

@ -927,7 +927,7 @@ Use the ``--sql`` option to output the SQL that would be executed, rather than r
where where
[documents_fts] match :query [documents_fts] match :query
order by order by
rank desc rank
.. _cli_vacuum: .. _cli_vacuum:

View file

@ -1370,7 +1370,7 @@ class Table(Queryable):
rank=rank, rank=rank,
rank_implementation=rank_implementation, rank_implementation=rank_implementation,
fts_table=fts_table, fts_table=fts_table,
order=order or "{} desc".format(rank), order=order or rank,
limit="limit {}".format(limit) if limit else "", limit="limit {}".format(limit) if limit else "",
).strip() ).strip()

View file

@ -386,7 +386,7 @@ def test_enable_fts_replace_does_nothing_if_args_the_same():
"where\n" "where\n"
" [books_fts] match :query\n" " [books_fts] match :query\n"
"order by\n" "order by\n"
" rank desc" " rank"
), ),
), ),
( (

View file

@ -56,7 +56,7 @@ def test_with_tracer():
("select name from sqlite_master where type = 'view'", None), ("select name from sqlite_master where type = 'view'", None),
("select sql from sqlite_master where name = ?", ("dogs_fts",)), ("select sql from sqlite_master where name = ?", ("dogs_fts",)),
( (
"with original as (\n select\n rowid,\n *\n from [dogs]\n)\nselect\n original.*,\n [dogs_fts].rank as rank\nfrom\n [original]\n join [dogs_fts] on [original].rowid = [dogs_fts].rowid\nwhere\n [dogs_fts] match :query\norder by\n rank desc", "with original as (\n select\n rowid,\n *\n from [dogs]\n)\nselect\n original.*,\n [dogs_fts].rank as rank\nfrom\n [original]\n join [dogs_fts] on [original].rowid = [dogs_fts].rowid\nwhere\n [dogs_fts] match :query\norder by\n rank",
{"query": "Cleopaws"}, {"query": "Cleopaws"},
), ),
] ]