colin
/
pocketbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[#1231] fixed like escape expr

This commit is contained in:
Gani Georgiev 2022-12-11 17:30:25 +02:00
parent 5c899a4cf0
commit b63268559f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/search/filter.go
View File

@ -97,23 +97,23 @@ func (f FilterData) resolveTokenizedExpr(expr fexpr.Expr, fieldResolver FieldRes
case fexpr.SignLike: case fexpr.SignLike:
// the right side is a column and therefor wrap it with "%" for contains like behavior // the right side is a column and therefor wrap it with "%" for contains like behavior
if len(rParams) == 0 { if len(rParams) == 0 {
return dbx.NewExp(fmt.Sprintf("%s LIKE ('%%' || %s || '%%')", lName, rName), lParams), nil return dbx.NewExp(fmt.Sprintf("%s LIKE ('%%' || %s || '%%') ESCAPE '\\'", lName, rName), lParams), nil
} }
return dbx.NewExp(fmt.Sprintf("%s LIKE %s", lName, rName), mergeParams(lParams, wrapLikeParams(rParams))), nil return dbx.NewExp(fmt.Sprintf("%s LIKE %s ESCAPE '\\'", lName, rName), mergeParams(lParams, wrapLikeParams(rParams))), nil
case fexpr.SignNlike: case fexpr.SignNlike:
// the right side is a column and therefor wrap it with "%" for not-contains like behavior // the right side is a column and therefor wrap it with "%" for not-contains like behavior
if len(rParams) == 0 { if len(rParams) == 0 {
return dbx.NewExp(fmt.Sprintf("%s NOT LIKE ('%%' || %s || '%%')", lName, rName), lParams), nil return dbx.NewExp(fmt.Sprintf("%s NOT LIKE ('%%' || %s || '%%') ESCAPE '\\'", lName, rName), lParams), nil
} }
// normalize operands and switch sides if the left operand is a number/text, but the right one is a column // normalize operands and switch sides if the left operand is a number/text, but the right one is a column
// (usually this shouldn't be needed, but it's kept for backward compatibility) // (usually this shouldn't be needed, but it's kept for backward compatibility)
if len(lParams) > 0 && len(rParams) == 0 { if len(lParams) > 0 && len(rParams) == 0 {
return dbx.NewExp(fmt.Sprintf("%s NOT LIKE %s", rName, lName), wrapLikeParams(lParams)), nil return dbx.NewExp(fmt.Sprintf("%s NOT LIKE %s ESCAPE '\\'", rName, lName), wrapLikeParams(lParams)), nil
} }
return dbx.NewExp(fmt.Sprintf("%s NOT LIKE %s", lName, rName), mergeParams(lParams, wrapLikeParams(rParams))), nil return dbx.NewExp(fmt.Sprintf("%s NOT LIKE %s ESCAPE '\\'", lName, rName), mergeParams(lParams, wrapLikeParams(rParams))), nil
case fexpr.SignLt: case fexpr.SignLt:
return dbx.NewExp(fmt.Sprintf("%s < %s", lName, rName), mergeParams(lParams, rParams)), nil return dbx.NewExp(fmt.Sprintf("%s < %s", lName, rName), mergeParams(lParams, rParams)), nil
case fexpr.SignLte: case fexpr.SignLte:

22
tools/search/filter_test.go
View File

@ -35,7 +35,7 @@ func TestFilterDataBuildExpr(t *testing.T) {
// like with 2 columns // like with 2 columns
{"test1 ~ test2", false, {"test1 ~ test2", false,
"^" + "^" +
regexp.QuoteMeta("[[test1]] LIKE ('%' || [[test2]] || '%')") + regexp.QuoteMeta("[[test1]] LIKE ('%' || [[test2]] || '%') ESCAPE '\\'") +
"$", "$",
}, },
// like with right column operand // like with right column operand
@ -43,7 +43,7 @@ func TestFilterDataBuildExpr(t *testing.T) {
"^" + "^" +
regexp.QuoteMeta("{:") + regexp.QuoteMeta("{:") +
".+" + ".+" +
regexp.QuoteMeta("} LIKE ('%' || [[test1]] || '%')") + regexp.QuoteMeta("} LIKE ('%' || [[test1]] || '%') ESCAPE '\\'") +
"$", "$",
}, },
// like with left column operand and text as right operand // like with left column operand and text as right operand
@ -51,13 +51,13 @@ func TestFilterDataBuildExpr(t *testing.T) {
"^" + "^" +
regexp.QuoteMeta("[[test1]] LIKE {:") + regexp.QuoteMeta("[[test1]] LIKE {:") +
".+" + ".+" +
regexp.QuoteMeta("}") + regexp.QuoteMeta("} ESCAPE '\\'") +
"$", "$",
}, },
// not like with 2 columns // not like with 2 columns
{"test1 !~ test2", false, {"test1 !~ test2", false,
"^" + "^" +
regexp.QuoteMeta("[[test1]] NOT LIKE ('%' || [[test2]] || '%')") + regexp.QuoteMeta("[[test1]] NOT LIKE ('%' || [[test2]] || '%') ESCAPE '\\'") +
"$", "$",
}, },
// not like with right column operand // not like with right column operand
@ -65,7 +65,7 @@ func TestFilterDataBuildExpr(t *testing.T) {
"^" + "^" +
regexp.QuoteMeta("{:") + regexp.QuoteMeta("{:") +
".+" + ".+" +
regexp.QuoteMeta("} NOT LIKE ('%' || [[test1]] || '%')") + regexp.QuoteMeta("} NOT LIKE ('%' || [[test1]] || '%') ESCAPE '\\'") +
"$", "$",
}, },
// like with left column operand and text as right operand // like with left column operand and text as right operand
@ -73,7 +73,7 @@ func TestFilterDataBuildExpr(t *testing.T) {
"^" + "^" +
regexp.QuoteMeta("[[test1]] NOT LIKE {:") + regexp.QuoteMeta("[[test1]] NOT LIKE {:") +
".+" + ".+" +
regexp.QuoteMeta("}") + regexp.QuoteMeta("} ESCAPE '\\'") +
"$", "$",
}, },
// current datetime constant // current datetime constant
@ -95,7 +95,7 @@ func TestFilterDataBuildExpr(t *testing.T) {
".+" + ".+" +
regexp.QuoteMeta("}, ''))) AND ([[test3]] LIKE {:") + regexp.QuoteMeta("}, ''))) AND ([[test3]] LIKE {:") +
".+" + ".+" +
regexp.QuoteMeta("})) AND (COALESCE([[test4.sub]], '') = COALESCE(NULL, ''))") + regexp.QuoteMeta("} ESCAPE '\\')) AND (COALESCE([[test4.sub]], '') = COALESCE(NULL, ''))") +
"$", "$",
}, },
// combination of special literals (null, true, false) // combination of special literals (null, true, false)
@ -111,13 +111,13 @@ func TestFilterDataBuildExpr(t *testing.T) {
"^" + "^" +
regexp.QuoteMeta("((((((((COALESCE([[test1]], '') = COALESCE([[test2]], '')) OR (COALESCE([[test2]], '') != COALESCE([[test3]], ''))) AND (([[test2]] LIKE {:") + regexp.QuoteMeta("((((((((COALESCE([[test1]], '') = COALESCE([[test2]], '')) OR (COALESCE([[test2]], '') != COALESCE([[test3]], ''))) AND (([[test2]] LIKE {:") +
".+" + ".+" +
regexp.QuoteMeta("}) OR ([[test2]] NOT LIKE {:") + regexp.QuoteMeta("} ESCAPE '\\') OR ([[test2]] NOT LIKE {:") +
".+" + ".+" +
regexp.QuoteMeta("}))) AND ({:") + regexp.QuoteMeta("} ESCAPE '\\'))) AND ({:") +
".+" + ".+" +
regexp.QuoteMeta("} LIKE ('%' || [[test1]] || '%'))) AND ({:") + regexp.QuoteMeta("} LIKE ('%' || [[test1]] || '%') ESCAPE '\\')) AND ({:") +
".+" + ".+" +
regexp.QuoteMeta("} NOT LIKE ('%' || [[test2]] || '%'))) AND ([[test3]] > {:") + regexp.QuoteMeta("} NOT LIKE ('%' || [[test2]] || '%') ESCAPE '\\')) AND ([[test3]] > {:") +
".+" + ".+" +
regexp.QuoteMeta("})) AND ([[test3]] >= {:") + regexp.QuoteMeta("})) AND ([[test3]] >= {:") +
".+" + ".+" +