patched binary walk

Author: adranwit

expr/binary.go

@@ -70,12 +70,20 @@ func (b *Binary) walk(fn func(ident node.Node, values *Values, operator, parentO
 	if err != nil {
 		return err
 	}
+
 	if binY, ok := b.Y.(*Binary); ok {
 		if nested, ok := binY.Y.(*Binary); ok {
 			if err = nested.walk(fn, binY.Op); err != nil {
 				return err
 			}
 		}
+		if nested, ok := binY.Y.(*Parenthesis); ok {
+			if nestedBin, ok := nested.X.(*Binary); ok {
+				if err = nestedBin.walk(fn, binY.Op); err != nil {
+					return err
+				}
+			}
+		}
 
 	}
 	return nil

expr/values.go

@@ -97,9 +97,13 @@ func NewValues(n node.Node) (*Values, error) {
 		values.append(Value{Placeholder: true})
 		return &values, nil
 	case *Binary:
-		if actual.Y.(*Binary) != nil {
+		switch actualY := actual.Y.(type) {
+		case *Binary:
 			return NewValues(actual.X)
+		case *Parenthesis:
+			return NewValues(actualY.X)
 		}
+
 		return NewValues(actual.Y)
 	case *Literal:
 		switch actual.Kind {
@@ -153,6 +157,14 @@ func NewValues(n node.Node) (*Values, error) {
 			values.append(vMax.X...)
 			return &values, nil
 		}
+	case []node.Node:
+		for _, item := range actual {
+			if aValue, ok := item.(*Literal); ok {
+				v, _ := NewValue(aValue.Value)
+				values.append(*v)
+			}
+		}
+		return &values, nil
 	}
 
 	return nil, fmt.Errorf("unsupported value node: %T", n)

query_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestBinaryWalk(t *testing.T) {
-	query, _ := ParseQuery("SELECT * FROM t WHERE a = 1 AND b = 2 AND c IN(1,2)")
+	query, _ := ParseQuery("SELECT * FROM t WHERE a = 1 AND b = 2 AND (c IN(1,2))")
 	binary, ok := query.Qualify.X.(*expr.Binary)
 	if !assert.True(t, ok) {
 		return