From b1741d31de9f892595c8f20dfab8e2d0d1e83a55 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 28 Nov 2022 17:53:41 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9F=A5=E6=89=BE=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E4=B8=AD=E4=BD=BF=E7=94=A8=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE?= =?UTF-8?q?=E5=BC=8F=E5=90=8E=E6=9B=BF=E6=8D=A2=E4=B8=8D=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/6722?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/search.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kernel/model/search.go b/kernel/model/search.go index bc2518a39..07f9cef0d 100644 --- a/kernel/model/search.go +++ b/kernel/model/search.go @@ -545,7 +545,7 @@ func fullTextSearchByRegexp(exp, box, path, typeFilter string, beforeLen int) (r exp = gulu.Str.RemoveInvisible(exp) fieldFilter := fieldRegexp(exp) - stmt := "SELECT * FROM `blocks` WHERE " + fieldFilter + " AND type IN " + typeFilter + stmt := "SELECT * FROM `blocks` WHERE (" + fieldFilter + ") AND type IN " + typeFilter if "" != box { stmt += " AND box = '" + box + "'" } @@ -767,30 +767,30 @@ func fieldRegexp(regexp string) string { buf := bytes.Buffer{} buf.WriteString("content REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") if Conf.Search.Name { buf.WriteString(" OR name REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") } if Conf.Search.Alias { buf.WriteString(" OR alias REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") } if Conf.Search.Memo { buf.WriteString(" OR memo REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") } if Conf.Search.Custom { buf.WriteString(" OR ial REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") } buf.WriteString(" OR tag REGEXP '") buf.WriteString(regexp) - buf.WriteString("' ") + buf.WriteString("'") return buf.String() }