Skip to content

[fix] notContains rule did not work because of INSTR expected value -1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2021
Merged

[fix] notContains rule did not work because of INSTR expected value -1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Blocks can be nested like next
}
```

### between / notBeetween
### between / notBetween

For those operations, both start and end values can be provided

Expand Down
2 changes: 1 addition & 1 deletion sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func GetSQL(data Filter, config *SQLConfig) (string, []interface{}, error) {
case "contains":
return fmt.Sprintf("INSTR(%s, ?) > 0", data.Field), values, nil
case "notContains":
return fmt.Sprintf("INSTR(%s, ?) < 0", data.Field), values, nil
return fmt.Sprintf("INSTR(%s, ?) = 0", data.Field), values, nil
case "lessOrEqual":
return fmt.Sprintf("%s <= ?", data.Field), values, nil
case "greaterOrEqual":
Expand Down
29 changes: 14 additions & 15 deletions sql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var cases = [][]string{
},
[]string{
`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notContains", "filter":1 }}]}`,
"INSTR(a, ?) < 0",
"INSTR(a, ?) = 0",
"1",
},
[]string{
Expand Down Expand Up @@ -130,7 +130,6 @@ var cases = [][]string{
},
}


func anyToStringArray(some []interface{}) (string, error) {
out := make([]string, 0, len(some))
for _, x := range some {
Expand Down Expand Up @@ -229,10 +228,10 @@ func TestCustomOperation(t *testing.T) {

sql, vals, err := GetSQL(format, &SQLConfig{
Operations: map[string]CustomOperation{
"is null" : func(n string, r string, values []interface{}) (string, []interface{}, error) {
"is null": func(n string, r string, values []interface{}) (string, []interface{}, error) {
return fmt.Sprintf("%s IS NULL", n), NoValues, nil
},
"range100" : func(n string, r string, values []interface{}) (string, []interface{}, error) {
"range100": func(n string, r string, values []interface{}) (string, []interface{}, error) {
out := []interface{}{values[0], values[0]}
return fmt.Sprintf("( %s > ? AND %s < ? + 100 )", n, n), out, nil
},
Expand All @@ -250,15 +249,15 @@ func TestCustomOperation(t *testing.T) {
return
}

valsStr, err := anyToStringArray(vals)
if err != nil {
t.Errorf("can't convert parameters\nj: %s\n%f", cOrC, err)
return
}
valsStr, err := anyToStringArray(vals)
if err != nil {
t.Errorf("can't convert parameters\nj: %s\n%f", cOrC, err)
return
}

check = "500,500"
if valsStr != check {
t.Errorf("wrong sql generated\nj: %s\ns: %s\nr: %s", cOrC, check, valsStr)
return
}
}
check = "500,500"
if valsStr != check {
t.Errorf("wrong sql generated\nj: %s\ns: %s\nr: %s", cOrC, check, valsStr)
return
}
}