Fix ast walk (sqlc-dev#509)

kyleconroy · web-flow · commit b28e3dabbd58 · 2020-05-18T11:49:34.000-07:00
* Actually call parseQuery

* sql/ast: Do not call Walk with nil value
diff --git a/internal/compiler/compile.go b/internal/compiler/compile.go
@@ -96,14 +96,18 @@ func parseQueries(p Parser, c *catalog.Catalog, queries []string) (*Result, erro
 			merr.Add(filename, "", 0, err)
 			continue
 		}
-		source := string(blob)
-		stmts, err := p.Parse(strings.NewReader(source))
+		src := string(blob)
+		stmts, err := p.Parse(strings.NewReader(src))
 		if err != nil {
-			merr.Add(filename, source, 0, err)
+			merr.Add(filename, src, 0, err)
 			continue
 		}
 		for _, stmt := range stmts {
-			fmt.Println(stmt)
+			_, err := parseQuery(p, c, stmt.Raw, src, false)
+			if err != nil {
+				merr.Add(filename, src, stmt.Raw.Pos(), err)
+				continue
+			}
 		}
 	}
 	if len(merr.Errs()) > 0 {
@@ -112,6 +116,7 @@ func parseQueries(p Parser, c *catalog.Catalog, queries []string) (*Result, erro
 	return &Result{}, nil
 }
 
+// Deprecated.
 func buildResult(c *catalog.Catalog) (*Result, error) {
 	var structs []dinosql.GoStruct
 	var enums []dinosql.GoEnum
diff --git a/internal/compiler/parse.go b/internal/compiler/parse.go
@@ -1,4 +1,4 @@
-package runtime
+package compiler
 
 import (
 	"errors"
@@ -17,7 +17,7 @@ type Query struct {
 
 var ErrUnsupportedStatementType = errors.New("parseQuery: unsupported statement type")
 
-func parseQuery(c *catalog.Catalog, stmt ast.Node, src string, rewriteParameters bool) (*Query, error) {
+func parseQuery(p Parser, c *catalog.Catalog, stmt ast.Node, src string, rewriteParameters bool) (*Query, error) {
 	if err := validate.ParamStyle(stmt); err != nil {
 		return nil, err
 	}
diff --git a/internal/sql/astutils/walk.go b/internal/sql/astutils/walk.go

Original file line number	Diff line number	Diff line change
`@@ -96,14 +96,18 @@ func parseQueries(p Parser, c catalog.Catalog, queries []string) (Result, erro`
`96`	`96`	`merr.Add(filename, "", 0, err)`
`97`	`97`	`continue`
`98`	`98`	`}`
`99`		`- source := string(blob)`
`100`		`- stmts, err := p.Parse(strings.NewReader(source))`
	`99`	`+ src := string(blob)`
	`100`	`+ stmts, err := p.Parse(strings.NewReader(src))`
`101`	`101`	`if err != nil {`
`102`		`- merr.Add(filename, source, 0, err)`
	`102`	`+ merr.Add(filename, src, 0, err)`
`103`	`103`	`continue`
`104`	`104`	`}`
`105`	`105`	`for _, stmt := range stmts {`
`106`		`- fmt.Println(stmt)`
	`106`	`+ _, err := parseQuery(p, c, stmt.Raw, src, false)`
	`107`	`+ if err != nil {`
	`108`	`+ merr.Add(filename, src, stmt.Raw.Pos(), err)`
	`109`	`+ continue`
	`110`	`+ }`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`	`if len(merr.Errs()) > 0 {`
`@@ -112,6 +116,7 @@ func parseQueries(p Parser, c catalog.Catalog, queries []string) (Result, erro`
`112`	`116`	`return &Result{}, nil`
`113`	`117`	`}`
`114`	`118`
	`119`	`+// Deprecated.`
`115`	`120`	`func buildResult(c catalog.Catalog) (Result, error) {`
`116`	`121`	`var structs []dinosql.GoStruct`
`117`	`122`	`var enums []dinosql.GoEnum`