[add] between rules and start,end value

Author: mkozhukh

condition.go

@@ -0,0 +1,15 @@
+package querysql
+
+type Condition struct {
+	Rule  string `json:"type"`
+	Value interface{} `json:"filter"`
+}
+
+func (c *Condition) getValues() []interface{} {
+	valueMap, ok := c.Value.(map[string]interface{})
+	if !ok {
+		return []interface{}{c.Value}
+	}
+
+	return []interface{}{valueMap["start"], valueMap["end"]}
+}

sql.go

@@ -14,12 +14,7 @@ type Filter struct {
 	Kids      []Filter      `json:"rules"`
 }
 
-type Condition struct {
-	Rule  string      `json:"type"`
-	Value interface{} `json:"filter"`
-}
-
-type CustomOperation func(string, Condition) (string, []interface{}, error)
+type CustomOperation func(string, string, []interface{}) (string, []interface{}, error)
 
 type SQLConfig struct {
 	Whitelist  map[string]bool
@@ -54,43 +49,68 @@ func GetSQL(data Filter, config *SQLConfig) (string, []interface{}, error) {
 			return inSQL(data.Field, data.Includes)
 		}
 
+		values := data.Condition.getValues()
 		switch data.Condition.Rule {
 		case "":
 			return "", NoValues, nil
 		case "equal":
-			return fmt.Sprintf("%s = ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s = ?", data.Field), values, nil
 		case "notEqual":
-			return fmt.Sprintf("%s <> ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s <> ?", data.Field), values, nil
 		case "contains":
-			return fmt.Sprintf("INSTR(%s, ?) > 0", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("INSTR(%s, ?) > 0", data.Field), values, nil
 		case "notContains":
-			return fmt.Sprintf("INSTR(%s, ?) < 0", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("INSTR(%s, ?) < 0", data.Field), values, nil
 		case "lessOrEqual":
-			return fmt.Sprintf("%s <= ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s <= ?", data.Field), values, nil
 		case "greaterOrEqual":
-			return fmt.Sprintf("%s >= ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s >= ?", data.Field), values, nil
 		case "less":
-			return fmt.Sprintf("%s < ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s < ?", data.Field), values, nil
+		case "notBetween":
+			if len(values) != 2 {
+				return "", nil, fmt.Errorf("wrong number of parameters for notBetween operation: %d", len(values))
+			}
+
+			if values[0] == nil {
+				return fmt.Sprintf("%s > ?", data.Field), values[1:], nil
+			} else if values[1] == nil {
+				return fmt.Sprintf("%s < ?", data.Field), values[:1], nil
+			} else {
+				return fmt.Sprintf("( %s < ? OR %s > ? )", data.Field, data.Field), values, nil
+			}
+		case "between":
+			if len(values) != 2 {
+				return "", nil, fmt.Errorf("wrong number of parameters for notBetween operation: %d", len(values))
+			}
+
+			if values[0] == nil {
+				return fmt.Sprintf("%s < ?", data.Field), values[1:], nil
+			} else if values[1] == nil {
+				return fmt.Sprintf("%s > ?", data.Field), values[:1], nil
+			} else {
+				return fmt.Sprintf("( %s > ? AND %s < ? )", data.Field, data.Field), values, nil
+			}
 		case "greater":
-			return fmt.Sprintf("%s > ?", data.Field), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s > ?", data.Field), values, nil
 		case "beginsWith":
 			search := "CONCAT(?, '%')"
-			return fmt.Sprintf("%s LIKE %s", data.Field, search), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s LIKE %s", data.Field, search), values, nil
 		case "notBeginsWith":
 			search := "CONCAT(?, '%')"
-			return fmt.Sprintf("%s NOT LIKE %s", data.Field, search), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s NOT LIKE %s", data.Field, search), values, nil
 		case "endsWith":
 			search := "CONCAT('%', ?)"
-			return fmt.Sprintf("%s LIKE %s", data.Field, search), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s LIKE %s", data.Field, search), values, nil
 		case "notEndsWith":
 			search := "CONCAT('%', ?)"
-			return fmt.Sprintf("%s NOT LIKE %s", data.Field, search), []interface{}{data.Condition.Value}, nil
+			return fmt.Sprintf("%s NOT LIKE %s", data.Field, search), values, nil
 		}
 
 		if config != nil && config.Operations != nil {
 			op, opOk := config.Operations[data.Condition.Rule]
 			if opOk {
-				return op(data.Field, data.Condition)
+				return op(data.Field, data.Condition.Rule, data.Condition.getValues())
 			}
 		}
 

sql_test.go

@@ -73,6 +73,36 @@ var cases = [][]string{
 		"a NOT LIKE CONCAT('%', ?)",
 		"1",
 	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"between", "filter":{ "start":1, "end":2 } }}]}`,
+		"( a > ? AND a < ? )",
+		"1,2",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"between", "filter":{ "start":1 } }}]}`,
+		"a > ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"between", "filter":{ "end":2 } }}]}`,
+		"a < ?",
+		"2",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notBetween", "filter":{ "start":1, "end":2 } }}]}`,
+		"( a < ? OR a > ? )",
+		"1,2",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notBetween", "filter":{ "start":1 } }}]}`,
+		"a < ?",
+		"1",
+	},
+	[]string{
+		`{ "glue":"and", "rules":[{ "field": "a", "condition":{ "type":"notBetween", "filter":{ "end":2 } }}]}`,
+		"a > ?",
+		"2",
+	},
 	[]string{
 		aAndB,
 		"( a < ? AND b > ? )",
@@ -199,11 +229,12 @@ func TestCustomOperation(t *testing.T) {
 
 	sql, vals, err := GetSQL(format, &SQLConfig{
 		Operations: map[string]CustomOperation{
-			"is null" : func(n string, c Condition) (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, c Condition) (string, []interface{}, error) {
-				return fmt.Sprintf("( %s > ? AND %s < ? + 100 )", n, n), []interface{}{c.Value, c.Value}, nil
+			"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
 			},
 		},
 	})