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

added json marshal fallback for complex structs as placeholder param

This commit is contained in:
Gani Georgiev 2023-08-19 16:33:45 +03:00
parent bcfbbc53f8
commit 6baae97b5d
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/search/filter.go
View File

@ -1,6 +1,7 @@
package search package search
import ( import (
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"strconv" "strconv"
@ -49,7 +50,15 @@ func (f FilterData) BuildExpr(
case bool, float64, float32, int, int64, int32, int16, int8, uint, uint64, uint32, uint16, uint8: case bool, float64, float32, int, int64, int32, int16, int8, uint, uint64, uint32, uint16, uint8:
replacement = cast.ToString(v) replacement = cast.ToString(v)
default: default:
replacement = strconv.Quote(cast.ToString(v)) replacement = cast.ToString(v)
// try to json serialize as fallback
if replacement == "" {
raw, _ := json.Marshal(v)
replacement = string(raw)
}
replacement = strconv.Quote(replacement)
} }
raw = strings.ReplaceAll(raw, "{:"+key+"}", replacement) raw = strings.ReplaceAll(raw, "{:"+key+"}", replacement)
} }

8
tools/search/filter_test.go
View File

@ -200,7 +200,9 @@ func TestFilterDataBuildExprWithParams(t *testing.T) {
test7 = {:test7} || test7 = {:test7} ||
test8 = {:test8} || test8 = {:test8} ||
test9 = {:test9} || test9 = {:test9} ||
test10 = {:test10} test10 = {:test10} ||
test11 = {:test11} ||
test12 = {:test12}
`) `)
replacements := []dbx.Params{ replacements := []dbx.Params{
@ -210,6 +212,8 @@ func TestFilterDataBuildExprWithParams(t *testing.T) {
{"test4": nil}, {"test4": nil},
{"test5": "", "test6": "simple", "test7": `'single_quotes'`, "test8": `"double_quotes"`, "test9": `escape\"quote`}, {"test5": "", "test6": "simple", "test7": `'single_quotes'`, "test8": `"double_quotes"`, "test9": `escape\"quote`},
{"test10": date}, {"test10": date},
{"test11": []string{"a", "b", `"quote`}},
{"test12": map[string]any{"a": 123, "b": `quote"`}},
} }
expr, err := filter.BuildExpr(resolver, replacements...) expr, err := filter.BuildExpr(resolver, replacements...)
@ -223,7 +227,7 @@ func TestFilterDataBuildExprWithParams(t *testing.T) {
t.Fatalf("Expected 1 query, got %d", len(calledQueries)) t.Fatalf("Expected 1 query, got %d", len(calledQueries))
} }
expectedQuery := `SELECT * WHERE ([[test1]] = 1 OR [[test2]] = 0 OR [[test3a]] = 123.456 OR [[test3b]] = 123.456 OR ([[test4]] = '' OR [[test4]] IS NULL) OR ([[test5]] = '' OR [[test5]] IS NULL) OR [[test6]] = 'simple' OR [[test7]] = '''single_quotes''' OR [[test8]] = '"double_quotes"' OR [[test9]] = 'escape\\"quote' OR [[test10]] = '2023-01-01 00:00:00 +0000 UTC')` expectedQuery := `SELECT * WHERE ([[test1]] = 1 OR [[test2]] = 0 OR [[test3a]] = 123.456 OR [[test3b]] = 123.456 OR ([[test4]] = '' OR [[test4]] IS NULL) OR [[test5]] = '""' OR [[test6]] = 'simple' OR [[test7]] = '''single_quotes''' OR [[test8]] = '"double_quotes"' OR [[test9]] = 'escape\\"quote' OR [[test10]] = '2023-01-01 00:00:00 +0000 UTC' OR [[test11]] = '["a","b","\\"quote"]' OR [[test12]] = '{"a":123,"b":"quote\\""}')`
if expectedQuery != calledQueries[0] { if expectedQuery != calledQueries[0] {
t.Fatalf("Expected query \n%s, \ngot \n%s", expectedQuery, calledQueries[0]) t.Fatalf("Expected query \n%s, \ngot \n%s", expectedQuery, calledQueries[0])
} }