Merge pull request #4 from dennigogo/added-filter-list-with-query-parser

Added filter list with query parser ('NOT IN' as 'nin')

Author: timsolov

README.md

@@ -64,8 +64,8 @@ See cmd/main.go and tests for more examples.
 * `:bool` - parameter must be convertable to bool type. Raise error if not.
 
 ## Supported types
-- `string` - the default type for all provided filters if not specified another. Could be compared by `eq, ne, gt, lt, gte, lte, like, ilike, nlike, nilike, in, is, not` methods (`nlike, nilike` means `NOT LIKE, NOT ILIKE` respectively, `is, not` for comparison to NULL `IS NULL, IS NOT NULL`).
-- `int` - integer type. Must be specified with tag ":int". Could be compared by `eq, ne, gt, lt, gte, lte, in` methods.
+- `string` - the default type for all provided filters if not specified another. Could be compared by `eq, ne, gt, lt, gte, lte, like, ilike, nlike, nilike, in, nin, is, not` methods (`nlike, nilike` means `NOT LIKE, NOT ILIKE` respectively, `in, nin` means `IN, NOT IN` respectively, `is, not` for comparison to NULL `IS NULL, IS NOT NULL`).
+- `int` - integer type. Must be specified with tag ":int". Could be compared by `eq, ne, gt, lt, gte, lte, in, nin` methods.
 - `bool` - boolean type. Must be specified with tag ":bool". Could be compared by `eq` method.
 
 ## Date usage

filter.go

@@ -210,7 +210,7 @@ func (f *Filter) Where() (string, error) {
 return exp, nil
 }
 return exp, ErrUnknownMethod
-case IN:
+case IN, NIN:
 exp = fmt.Sprintf("%s %s (?)", f.Name, translateMethods[f.Method])
 exp, _, _ = in(exp, f.Value)
 return exp, nil
@@ -244,7 +244,7 @@ func (f *Filter) Args() ([]interface{}, error) {
 }
 args = append(args, value)
 return args, nil
-case IN:
+case IN, NIN:
 _, params, _ := in("?", f.Value)
 args = append(args, params...)
 return args, nil
@@ -256,7 +256,7 @@ func (f *Filter) Args() ([]interface{}, error) {
 func (f *Filter) setInt(list []string) error {
 if len(list) == 1 {
 switch f.Method {
-case EQ, NE, GT, LT, GTE, LTE, IN:
+case EQ, NE, GT, LT, GTE, LTE, IN, NIN:
 i, err := strconv.Atoi(list[0])
 if err != nil {
 return ErrBadFormat
@@ -266,7 +266,7 @@ func (f *Filter) setInt(list []string) error {
 return ErrMethodNotAllowed
 }
 } else {
-if f.Method != IN {
+if f.Method != IN && f.Method != NIN {
 return ErrMethodNotAllowed
 }
 intSlice := make([]int, len(list))
@@ -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, NLIKE, NILIKE, IN:
+case EQ, NE, GT, LT, GTE, LTE, LIKE, ILIKE, NLIKE, NILIKE, IN, NIN:
 f.Value = list[0]
 return nil
 case IS, NOT:
@@ -315,7 +315,7 @@ func (f *Filter) setString(list []string) error {
 }
 } else {
 switch f.Method {
-case IN:
+case IN, NIN:
 f.Value = list
 return nil
 }

main.go

@@ -45,6 +45,7 @@ var (
 IS Method = "IS"
 NOT Method = "NOT"
 IN Method = "IN"
+NIN Method = "NIN"
 )
 
 // NULL constant
@@ -65,6 +66,7 @@ var (
 IS: "IS",
 NOT: "IS NOT",
 IN: "IN",
+NIN: "NOT IN",
 }
 )
 

main_test.go

@@ -212,13 +212,16 @@ func TestWhere(t *testing.T) {
 {url: "?id=1.2", expected: "", err: "id: bad format"},
 {url: "?id[in]=1.2", expected: "", err: "id[in]: bad format"},
 {url: "?id[in]=1.2,1.2", expected: "", err: "id[in]: bad format"},
+{url: "?id[nin]=1.2", expected: "", err: "id[nin]: bad format"},
+{url: "?id[nin]=1.2,1.2", expected: "", err: "id[nin]: bad format"},
 {url: "?id[test]=1", expected: "", err: "id[test]: unknown method"},
 {url: "?id[like]=1", expected: "", err: "id[like]: method are not allowed"},
 {url: "?id=1,2", expected: "", err: "id: method are not allowed"},
 {url: "?id=4", expected: " WHERE id = ?"},
 
 {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"},
+{url: "?id[nin]=100,200", err: "id[nin]: can't be greater then 10"},
 
 // not like, not ilike:
 {url: "?u[nlike]=superman", expected: " WHERE u NOT LIKE ?"},
@@ -229,6 +232,8 @@ func TestWhere(t *testing.T) {
 {url: "?s=super", expected: " WHERE s = ?"},
 {url: "?s[in]=super,puper", err: "s[in]: puper: not in scope"},
 {url: "?s[in]=super,best", expected: " WHERE s IN (?, ?)"},
+{url: "?s[nin]=super,puper", err: "s[nin]: puper: not in scope"},
+{url: "?s[nin]=super,best", expected: " WHERE s NOT IN (?, ?)"},
 {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"},