[update] json syntax, extra rules

Author: mkozhukh

sql.go

@@ -15,8 +15,8 @@ type Filter struct {
 }
 
 type Condition struct {
-	Rule  string      `json:"rule"`
-	Value interface{} `json:"value"`
+	Rule  string      `json:"type"`
+	Value interface{} `json:"filter"`
 }
 
 type CustomOperation func(string, Condition) (string, []interface{}, error)
@@ -59,13 +59,24 @@ func GetSQL(data Filter, config *SQLConfig) (string, []interface{}, error) {
 			return "", NoValues, nil
 		case "equal":
 			return fmt.Sprintf("%s = ?", data.Field), []interface{}{data.Condition.Value}, nil
+		case "notEqual":
+			return fmt.Sprintf("%s <> ?", data.Field), []interface{}{data.Condition.Value}, nil
+		case "contains":
+			return fmt.Sprintf("INSTR(%s, ?) > 0", data.Field), []interface{}{data.Condition.Value}, nil
+		case "notContains":
+			return fmt.Sprintf("INSTR(%s, ?) < 0", data.Field), []interface{}{data.Condition.Value}, nil
+		case "lessOrEqual":
+			return fmt.Sprintf("%s <= ?", data.Field), []interface{}{data.Condition.Value}, nil
+		case "greaterOrEqual":
+			return fmt.Sprintf( "%s >= ?", data.Field), []interface{}{data.Condition.Value}, nil
 		case "less":
 			return fmt.Sprintf("%s < ?", data.Field), []interface{}{data.Condition.Value}, nil
 		case "greater":
 			return fmt.Sprintf("%s > ?", data.Field), []interface{}{data.Condition.Value}, nil
+
 		}
 
-		if config.Operations != nil {
+		if config != nil && config.Operations != nil {
 			op, opOk := config.Operations[data.Condition.Rule]
 			if opOk {
 				return op(data.Field, data.Condition)

sql_test.go

@@ -7,17 +7,52 @@ import (
 	"testing"
 )
 
-var aAndB = `{ "glue":"and", "rules":[{ "field": "a", "condition":{ "rule":"less", "value":1}}, { "field": "b", "condition":{ "rule":"greater", "value":"abc" }}]}`
-var aOrB = `{ "glue":"or", "rules":[{ "field": "a", "condition":{ "rule":"less", "value":1}}, { "field": "b", "condition":{ "rule":"greater", "value":"abc" }}]}`
-var cOrC = `{ "glue":"or", "rules":[{ "field": "a", "condition":{ "rule":"is null" }}, { "field": "b", "condition":{ "rule":"range100", "value":500 }}]}`
+var aAndB = `{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"less", "filter":1}}, { "field": "b", "condition":{ "type":"greater", "filter":"abc" }}]}`
+var aOrB = `{ "glue":"or", "rules":[{ "field": "a", "condition":{ "type":"less", "filter":1}}, { "field": "b", "condition":{ "type":"greater", "filter":"abc" }}]}`
+var cOrC = `{ "glue":"or", "rules":[{ "field": "a", "condition":{ "type":"is null" }}, { "field": "b", "condition":{ "type":"range100", "filter":500 }}]}`
 
 var cases = [][]string{
 	[]string{`{}`, "", ""},
 	[]string{
-		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "rule":"equal", "value":1 }}]}`,
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"equal", "filter":1 }}]}`,
 		"a = ?",
 		"1",
 	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notEqual", "filter":1 }}]}`,
+		"a <> ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"less", "filter":1 }}]}`,
+		"a < ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"lessOrEqual", "filter":1 }}]}`,
+		"a <= ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"greater", "filter":1 }}]}`,
+		"a > ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"greaterOrEqual", "filter":1 }}]}`,
+		"a >= ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"contains", "filter":1 }}]}`,
+		"INSTR(a, ?) > 0",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notContains", "filter":1 }}]}`,
+		"INSTR(a, ?) < 0",
+		"1",
+	},
 	[]string{
 		aAndB,
 		"( a < ? AND b > ? )",
@@ -29,7 +64,7 @@ var cases = [][]string{
 		"1,abc",
 	},
 	[]string{
-		`{ "glue":"AND", "rules":[` + aAndB + `,` + aOrB + `,{ "field":"c", "condition": { "rule":"equal", "value":3 } }]}`,
+		`{ "glue":"AND", "rules":[` + aAndB + `,` + aOrB + `,{ "field":"c", "condition": { "type":"equal", "filter":3 } }]}`,
 		"( ( a < ? AND b > ? ) AND ( a < ? OR b > ? ) AND c = ? )",
 		"1,abc,1,abc,3",
 	},
@@ -45,6 +80,7 @@ var cases = [][]string{
 	},
 }
 
+
 func anyToStringArray(some []interface{}) (string, error) {
 	out := make([]string, 0, len(some))
 	for _, x := range some {