tcsenpai/pensieve
1
0
Fork 0
mirror of https://github.com/tcsenpai/pensieve.git synced 2025-06-07 03:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(fts): use AND by default

Browse Source
This commit is contained in:
arkohut 2024-10-10 23:34:13 +08:00
parent f405d6e0a1
commit fffd084d3f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
memos/crud.py
View File

@ -413,9 +413,9 @@ def remove_plugin_from_library(library_id: int, plugin_id: int, db: Session):
raise ValueError(f"Plugin {plugin_id} not found in library {library_id}") raise ValueError(f"Plugin {plugin_id} not found in library {library_id}")
def or_words(input_string): def and_words(input_string):
words = input_string.split() words = input_string.split()
result = " OR ".join(words) result = " AND ".join(words)
return result return result
@ -427,7 +427,7 @@ def full_text_search(
start: Optional[int] = None, start: Optional[int] = None,
end: Optional[int] = None, end: Optional[int] = None,
) -> List[int]: ) -> List[int]:
or_query = or_words(query) and_query = and_words(query)
sql_query = """ sql_query = """
SELECT entities.id FROM entities SELECT entities.id FROM entities
@ -436,7 +436,7 @@ def full_text_search(
AND entities.file_type_group = 'image' AND entities.file_type_group = 'image'
""" """
params = {"query": or_query, "limit": limit} params = {"query": and_query, "limit": limit}
if library_ids: if library_ids:
library_ids_str = ", ".join(f"'{id}'" for id in library_ids) library_ids_str = ", ".join(f"'{id}'" for id in library_ids)