remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-09-28 04:44:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

.search_sql() fully respects columns=, closes #201

Browse source 
Refs #192 and #197
This commit is contained in:
Simon Willison 2020-11-08 08:53:53 -08:00
commit c5a798c15f
4 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/test_fts.py
View file

@ -35,7 +35,6 @@ def test_enable_fts(fresh_db):
"text": "tanuki are running tricksters",
"country": "Japan",
"not_searchable": "foo",
"rank": 0.0,
}
] == list(table.search("tanuki"))
assert [
@ -44,7 +43,6 @@ def test_enable_fts(fresh_db):
"text": "racoons are biting trash pandas",
"country": "USA",
"not_searchable": "bar",
"rank": 0.0,
}
] == list(table.search("usa"))
assert [] == list(table.search("bar"))
@ -71,7 +69,6 @@ def test_enable_fts_escape_table_names(fresh_db):
"text": "tanuki are running tricksters",
"country": "Japan",
"not_searchable": "foo",
"rank": 0.0,
}
] == list(table.search("tanuki"))
assert [
@ -80,7 +77,6 @@ def test_enable_fts_escape_table_names(fresh_db):
"text": "racoons are biting trash pandas",
"country": "USA",
"not_searchable": "bar",
"rank": 0.0,
}
] == list(table.search("usa"))
assert [] == list(table.search("bar"))
@ -116,7 +112,6 @@ def test_populate_fts(fresh_db):
"text": "racoons are biting trash pandas",
"country": "USA",
"not_searchable": "bar",
"rank": -0.5108256237659907,
}
] == rows
@ -137,7 +132,6 @@ def test_populate_fts_escape_table_names(fresh_db):
"text": "racoons are biting trash pandas",
"country": "USA",
"not_searchable": "bar",
"rank": -0.5108256237659907,
}
] == list(table.search("usa"))
@ -198,7 +192,6 @@ def test_enable_fts_with_triggers(fresh_db):
"text": "tanuki are running tricksters",
"country": "Japan",
"not_searchable": "foo",
"rank": 0.0,
}
]
table.insert(search_records[1])
@ -210,7 +203,6 @@ def test_enable_fts_with_triggers(fresh_db):
"text": "racoons are biting trash pandas",
"country": "USA",
"not_searchable": "bar",
"rank": 0.0,
}
]
assert [] == list(table.search("bar"))
@ -379,15 +371,14 @@ def test_enable_fts_replace_does_nothing_if_args_the_same():
" from [books]\n"
")\n"
"select\n"
" original.*,\n"
" [books_fts].rank as rank\n"
" [original].*\n"
"from\n"
" [original]\n"
" join [books_fts] on [original].rowid = [books_fts].rowid\n"
"where\n"
" [books_fts] match :query\n"
"order by\n"
" rank"
" [books_fts].rank"
),
),
(
@ -401,8 +392,7 @@ def test_enable_fts_replace_does_nothing_if_args_the_same():
" from [books]\n"
")\n"
"select\n"
" original.*,\n"
" [books_fts].rank as rank\n"
" [original].[title]\n"
"from\n"
" [original]\n"
" join [books_fts] on [original].rowid = [books_fts].rowid\n"
@ -424,15 +414,14 @@ def test_enable_fts_replace_does_nothing_if_args_the_same():
" from [books]\n"
")\n"
"select\n"
" original.*,\n"
" rank_bm25(matchinfo([books_fts], 'pcnalx')) as rank\n"
" [original].[title]\n"
"from\n"
" [original]\n"
" join [books_fts] on [original].rowid = [books_fts].rowid\n"
"where\n"
" [books_fts] match :query\n"
"order by\n"
" rank"
" rank_bm25(matchinfo([books_fts], 'pcnalx'))"
),
),
],