Mirrors/linkding
2
0
Fork 0
mirror of https://github.com/sissbruecker/linkding synced 2024-11-10 06:04:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make search case-insensitive on Postgres (#432)

Browse source
This commit is contained in:
Sascha Ißbrücker 2023-02-20 22:49:08 +01:00 committed by GitHub
parent f9ab3d1f44
commit 5049ff14cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bookmarks/queries.py
View file

@ -36,11 +36,11 @@ def _base_bookmarks_query(user: Optional[User], query_string: str) -> QuerySet:
# Filter for search terms and tags # Filter for search terms and tags
for term in query['search_terms']: for term in query['search_terms']:
query_set = query_set.filter( query_set = query_set.filter(
Q(title__contains=term) Q(title__icontains=term)
| Q(description__contains=term) | Q(description__icontains=term)
| Q(website_title__contains=term) | Q(website_title__icontains=term)
| Q(website_description__contains=term) | Q(website_description__icontains=term)
| Q(url__contains=term) | Q(url__icontains=term)
) )
for tag_name in query['tag_names']: for tag_name in query['tag_names']:

8
bookmarks/tests/test_queries.py
View file

@ -27,9 +27,13 @@ class QueriesTestCase(TestCase, BookmarkFactoryMixin):
self.term1_bookmarks = [ self.term1_bookmarks = [
self.setup_bookmark(url='http://example.com/term1'), self.setup_bookmark(url='http://example.com/term1'),
self.setup_bookmark(title=random_sentence(including_word='term1')), self.setup_bookmark(title=random_sentence(including_word='term1')),
self.setup_bookmark(title=random_sentence(including_word='TERM1')),
self.setup_bookmark(description=random_sentence(including_word='term1')), self.setup_bookmark(description=random_sentence(including_word='term1')),
self.setup_bookmark(description=random_sentence(including_word='TERM1')),
self.setup_bookmark(website_title=random_sentence(including_word='term1')), self.setup_bookmark(website_title=random_sentence(including_word='term1')),
self.setup_bookmark(website_title=random_sentence(including_word='TERM1')),
self.setup_bookmark(website_description=random_sentence(including_word='term1')), self.setup_bookmark(website_description=random_sentence(including_word='term1')),
self.setup_bookmark(website_description=random_sentence(including_word='TERM1')),
] ]
self.term1_term2_bookmarks = [ self.term1_term2_bookmarks = [
self.setup_bookmark(url='http://example.com/term1/term2'), self.setup_bookmark(url='http://example.com/term1/term2'),
@ -76,9 +80,13 @@ class QueriesTestCase(TestCase, BookmarkFactoryMixin):
self.term1_bookmarks = [ self.term1_bookmarks = [
self.setup_bookmark(url='http://example.com/term1', tags=[self.setup_tag()]), self.setup_bookmark(url='http://example.com/term1', tags=[self.setup_tag()]),
self.setup_bookmark(title=random_sentence(including_word='term1'), tags=[self.setup_tag()]), self.setup_bookmark(title=random_sentence(including_word='term1'), tags=[self.setup_tag()]),
self.setup_bookmark(title=random_sentence(including_word='TERM1'), tags=[self.setup_tag()]),
self.setup_bookmark(description=random_sentence(including_word='term1'), tags=[self.setup_tag()]), self.setup_bookmark(description=random_sentence(including_word='term1'), tags=[self.setup_tag()]),
self.setup_bookmark(description=random_sentence(including_word='TERM1'), tags=[self.setup_tag()]),
self.setup_bookmark(website_title=random_sentence(including_word='term1'), tags=[self.setup_tag()]), self.setup_bookmark(website_title=random_sentence(including_word='term1'), tags=[self.setup_tag()]),
self.setup_bookmark(website_title=random_sentence(including_word='TERM1'), tags=[self.setup_tag()]),
self.setup_bookmark(website_description=random_sentence(including_word='term1'), tags=[self.setup_tag()]), self.setup_bookmark(website_description=random_sentence(including_word='term1'), tags=[self.setup_tag()]),
self.setup_bookmark(website_description=random_sentence(including_word='TERM1'), tags=[self.setup_tag()]),
] ]
self.term1_term2_bookmarks = [ self.term1_term2_bookmarks = [
self.setup_bookmark(url='http://example.com/term1/term2', tags=[self.setup_tag()]), self.setup_bookmark(url='http://example.com/term1/term2', tags=[self.setup_tag()]),