fix err in keyword searching (#494)

go-shiori · Oct 9, 2022 · 821b69d · 821b69d
1 parent d15dc18
commit 821b69d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/database/pg.go b/internal/database/pg.go
@@ -223,7 +223,9 @@ func (db *PGDatabase) GetBookmarks(ctx context.Context, opts GetBookmarksOptions
  if opts.Keyword != "" {
  query += ` AND (
  url LIKE :lkw OR
- MATCH(title, excerpt, content) AGAINST (:kw IN BOOLEAN MODE)
+ title LIKE :kw OR
+ excerpt LIKE :kw OR
+ content LIKE :kw
  )`
 
  arg["lkw"] = "%" + opts.Keyword + "%"
@@ -356,7 +358,9 @@ func (db *PGDatabase) GetBookmarksCount(ctx context.Context, opts GetBookmarksOp
  if opts.Keyword != "" {
  query += ` AND (
  url LIKE :lurl OR
- MATCH(title, excerpt, content) AGAINST (:kw IN BOOLEAN MODE)
+ title LIKE :kw OR
+ excerpt LIKE :kw OR
+ content LIKE :kw
  )`
 
  arg["lurl"] = "%" + opts.Keyword + "%"

diff --git a/internal/database/sqlite.go b/internal/database/sqlite.go
@@ -355,6 +355,10 @@ func (db *SQLiteDatabase) GetBookmarks(ctx context.Context, opts GetBookmarksOpt
  bookmarkIds = append(bookmarkIds, book.ID)
  }
 
+ if len(bookmarkIds) == 0 {
+ return bookmarks, nil
+ }
+
  // If content needed, fetch it separately
  // It's faster than join with virtual table
  if opts.WithContent {