added two comparison methods: NLIKE, NILIKE

Author: timsolov

filter.go

@@ -201,7 +201,7 @@ func (f *Filter) Where() (string, error) {
 var exp string
 
 switch f.Method {
-case EQ, NE, GT, LT, GTE, LTE, LIKE, ILIKE:
+case EQ, NE, GT, LT, GTE, LTE, LIKE, ILIKE, NLIKE, NILIKE:
 exp = fmt.Sprintf("%s %s ?", f.Name, translateMethods[f.Method])
 return exp, nil
 case IS, NOT:
@@ -234,7 +234,7 @@ func (f *Filter) Args() ([]interface{}, error) {
 return args, nil
 }
 return nil, ErrUnknownMethod
-case LIKE, ILIKE:
+case LIKE, ILIKE, NLIKE, NILIKE:
 value := f.Value.(string)
 if len(value) >= 2 && strings.HasPrefix(value, "*") {
 value = "%" + value[1:]
@@ -302,7 +302,7 @@ func (f *Filter) setBool(list []string) error {
 func (f *Filter) setString(list []string) error {
 if len(list) == 1 {
 switch f.Method {
-case EQ, NE, GT, LT, GTE, LTE, LIKE, ILIKE, IN:
+case EQ, NE, GT, LT, GTE, LTE, LIKE, ILIKE, NLIKE, NILIKE, IN:
 f.Value = list[0]
 return nil
 case IS, NOT:

main.go

@@ -32,35 +32,39 @@ type Method string
 
 // Compare methods:
 var (
-EQ Method = "EQ"
-NE Method = "NE"
-GT Method = "GT"
-LT Method = "LT"
-GTE Method = "GTE"
-LTE Method = "LTE"
-LIKE Method = "LIKE"
-ILIKE Method = "ILIKE"
-IS Method = "IS"
-NOT Method = "NOT"
-IN Method = "IN"
+EQ Method = "EQ"
+NE Method = "NE"
+GT Method = "GT"
+LT Method = "LT"
+GTE Method = "GTE"
+LTE Method = "LTE"
+LIKE Method = "LIKE"
+ILIKE Method = "ILIKE"
+NLIKE Method = "NLIKE"
+NILIKE Method = "NILIKE"
+IS Method = "IS"
+NOT Method = "NOT"
+IN Method = "IN"
 )
 
 // NULL constant
 const NULL = "NULL"
 
 var (
 translateMethods map[Method]string = map[Method]string{
-EQ: "=",
-NE: "!=",
-GT: ">",
-LT: "<",
-GTE: ">=",
-LTE: "<=",
-LIKE: "LIKE",
-ILIKE: "ILIKE",
-IS: "IS",
-NOT: "IS NOT",
-IN: "IN",
+EQ: "=",
+NE: "!=",
+GT: ">",
+LT: "<",
+GTE: ">=",
+LTE: "<=",
+LIKE: "LIKE",
+ILIKE: "ILIKE",
+NLIKE: "NOT LIKE",
+NILIKE: "NOT ILIKE",
+IS: "IS",
+NOT: "IS NOT",
+IN: "IN",
 }
 )
 

main_test.go

@@ -220,6 +220,10 @@ func TestWhere(t *testing.T) {
 {url: "?id=100", err: "id: can't be greater then 10"},
 {url: "?id[in]=100,200", err: "id[in]: can't be greater then 10"},
 
+// not like, not ilike:
+{url: "?u[nlike]=superman", expected: " WHERE u NOT LIKE ?"},
+{url: "?u[nilike]=superman", expected: " WHERE u NOT ILIKE ?"},
+
 {url: "?id=1&name=superman", expected: " WHERE id = ?", ignore: true},
 {url: "?id=1&name=superman&s[like]=super", expected: " WHERE id = ? AND s LIKE ?", expected2: " WHERE s LIKE ? AND id = ?", ignore: true},
 {url: "?s=super", expected: " WHERE s = ?"},
@@ -228,11 +232,12 @@ func TestWhere(t *testing.T) {
 {url: "?s=puper", expected: "", err: "s: puper: not in scope"},
 {url: "?u=puper", expected: " WHERE u = ?"},
 {url: "?u[eq]=1,2", expected: "", err: "u[eq]: method are not allowed"},
-{url: "?u[gt]=1", expected: "", err: "u[gt]: method are not allowed"},
+{url: "?u[gt]=1", expected: " WHERE u > ?"},
 {url: "?id[in]=1,2", expected: " WHERE id IN (?, ?)"},
 {url: "?id[eq]=1&id[eq]=4", expected: " WHERE id = ? AND id = ?"},
 {url: "?id[gte]=1&id[lte]=4", expected: " WHERE id >= ? AND id <= ?", expected2: " WHERE id <= ? AND id >= ?"},
 {url: "?id[gte]=1|id[lte]=4", expected: " WHERE (id >= ? OR id <= ?)", expected2: " WHERE (id <= ? OR id >= ?)"},
+// null:
 {url: "?u[not]=NULL", expected: " WHERE u IS NOT NULL"},
 {url: "?u[is]=NULL", expected: " WHERE u IS NULL"},
 // bool: