update

webx-top · Aug 22, 2023 · 45ff0d3 · 45ff0d3
1 parent 8136ff5
commit 45ff0d3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/lib/factory/mysql/search.go b/lib/factory/mysql/search.go
@@ -145,7 +145,7 @@ func searchAllField(field string, keywords string, idFields ...string) *db.Compo
 		}
 		if strings.Contains(v, "||") {
 			vals := strings.Split(v, "||")
-			if fieldMode.operator == OperatorMatch {
+			if fieldMode.isMatchQuery() {
 				for _, val := range vals {
 					safelyMatchValues = append(safelyMatchValues, buildSafelyMatchValues(val, false)...)
 				}
@@ -161,7 +161,7 @@ func searchAllField(field string, keywords string, idFields ...string) *db.Compo
 			cd.Add(cond.Or())
 			continue
 		}
-		if fieldMode.operator == OperatorMatch {
+		if fieldMode.isMatchQuery() {
 			safelyMatchValues = append(safelyMatchValues, buildSafelyMatchValues(v, true)...)
 			continue
 		}

diff --git a/lib/factory/mysql/search_fulltext.go b/lib/factory/mysql/search_fulltext.go
@@ -7,13 +7,23 @@ import (
 	"github.com/webx-top/db"
 )
 
+// ft_boolean_syntax: + -><()~*:""&|
 var fulltextOperatorReplacer = strings.NewReplacer(
 	`'`, ``,
 	`+`, ``,
 	`-`, ``,
 	`*`, ``,
 	`"`, ``,
 	`\`, ``,
+	`>`, ``,
+	`<`, ``,
+	`(`, ``,
+	`)`, ``,
+	`~`, ``,
+	`*`, ``,
+	`:`, ``,
+	`&`, ``,
+	`|`, ``,
 )
 
 func CleanFulltextOperator(v string) string {
@@ -42,5 +52,6 @@ func match(safelyMatchValue string, booleanMode bool, keys ...string) db.Compoun
 	if booleanMode {
 		mode = ` IN BOOLEAN MODE`
 	}
-	return db.Raw("MATCH(" + strings.Join(fields, ",") + ") AGAINST ('" + safelyMatchValue + "'" + mode + ")")
+	// MATCH(`field`) AGAINST ('keywords' IN BOOLEAN MODE)
+	return db.Raw(`MATCH(` + strings.Join(fields, `,`) + `) AGAINST ('` + safelyMatchValue + `'` + mode + `)`)
 }