astutils: Apply changes to the ValuesList slice (#372)

Author: kyleconroy

internal/endtoend/testdata/named_param/go/query.sql.go

@@ -6,6 +6,13 @@ SELECT name FROM foo WHERE name = sqlc.arg('slug') AND sqlc.arg(filter)::bool;
 -- name: AtParams :many
 SELECT name FROM foo WHERE name = @slug AND @filter::bool;
 
+-- name: InsertFuncParams :one
+INSERT INTO foo(name, bio) values (sqlc.arg('name'), sqlc.arg('bio')) returning name;
+
+-- name: InsertAtParams :one
+INSERT INTO foo(name, bio) values (@name, @bio) returning name;
+
+
 -- name: Update :one
 UPDATE foo
 SET

internal/endtoend/testdata/named_param/query.sql

@@ -133,6 +133,17 @@ type application struct {
 	iter      iterator
 }
 
+type dummyNode struct {
+	Node nodes.Node
+}
+
+func (node dummyNode) Deparse() string {
+	panic("Not Implemented")
+}
+
+func (node dummyNode) Fingerprint(ctx nodes.FingerprintContext, parentNode nodes.Node, parentFieldName string) {
+}
+
 func (a *application) apply(parent nodes.Node, name string, iter *iterator, node nodes.Node) {
 	// convert typed nil into untyped nil
 	if v := reflect.ValueOf(node); v.Kind() == reflect.Ptr && v.IsNil() {
@@ -1291,13 +1302,20 @@ func (a *application) apply(parent nodes.Node, name string, iter *iterator, node
 		a.apply(&n, "GroupClause", nil, n.GroupClause)
 		a.apply(&n, "HavingClause", nil, n.HavingClause)
 		a.apply(&n, "WindowClause", nil, n.WindowClause)
-		// TODO: Not sure how to handle a slice of a slice
-		//
-		// for _, vs := range n.ValuesLists {
-		// 	for _, v := range vs {
-		// 		a.apply(&n, "", nil, v)
-		// 	}
-		// }
+
+		// ValuesLists is a slice of Node slices, which does not implement the
+		// Node interface For each Node in the list, pass a dummy node to apply
+		// and then updated the ValuesList if it was set.
+		for i := range n.ValuesLists {
+			for j := range n.ValuesLists[i] {
+				dn := dummyNode{}
+				a.apply(&dn, "Node", nil, n.ValuesLists[i][j])
+				if dn.Node != nil {
+					n.ValuesLists[i][j] = dn.Node
+				}
+			}
+		}
+
 		a.apply(&n, "SortClause", nil, n.SortClause)
 		a.apply(&n, "LimitOffset", nil, n.LimitOffset)
 		a.apply(&n, "LimitCount", nil, n.LimitCount)