Add syntax error tests

Author: kyleconroy

internal/dolphin/parse.go

@@ -1,16 +1,19 @@
 package dolphin
 
 import (
+	"errors"
 	"io"
 	"io/ioutil"
+	"regexp"
+	"strconv"
 	"strings"
 
-	"github.com/davecgh/go-spew/spew"
 	"github.com/pingcap/parser"
 	_ "github.com/pingcap/tidb/types/parser_driver"
 
 	"github.com/kyleconroy/sqlc/internal/metadata"
 	"github.com/kyleconroy/sqlc/internal/sql/ast"
+	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
 )
 
 func NewParser() *Parser {
@@ -21,15 +24,39 @@ type Parser struct {
 	pingcap *parser.Parser
 }
 
+var lineColumn = regexp.MustCompile(`^line (\d+) column (\d+) (.*)`)
+
+func normalizeErr(err error) error {
+	if err == nil {
+		return err
+	}
+	parts := strings.Split(err.Error(), "\n")
+	msg := strings.TrimSpace(parts[0] + "\"")
+	out := lineColumn.FindStringSubmatch(msg)
+	if len(out) == 4 {
+		line, lineErr := strconv.Atoi(out[1])
+		col, colErr := strconv.Atoi(out[2])
+		if lineErr != nil || colErr != nil {
+			return errors.New(msg)
+		}
+		return &sqlerr.Error{
+			Message: "syntax error",
+			Err:     errors.New(out[3]),
+			Line:    line,
+			Column:  col,
+		}
+	}
+	return errors.New(msg)
+}
+
 func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	blob, err := ioutil.ReadAll(r)
 	if err != nil {
 		return nil, err
 	}
 	stmtNodes, _, err := p.pingcap.Parse(string(blob), "", "")
 	if err != nil {
-		spew.Dump(err)
-		return nil, err
+		return nil, normalizeErr(err)
 	}
 	var stmts []ast.Statement
 	for i := range stmtNodes {

internal/endtoend/testdata/dolphin_errors/endtoend.json

@@ -0,0 +1,3 @@
+{
+  "experimental_parser_only": true
+}

internal/endtoend/testdata/dolphin_errors/stderr.txt

@@ -0,0 +1,4 @@
+# package querytest
+query/from.sql:2:38: syntax error near "from where id = ?;"
+query/select.sql:2:34: syntax error near "select id;"
+query/typo.sql:2:8: syntax error near "selectt id, first_name from users;"

internal/multierr/error.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/kyleconroy/sqlc/internal/pg"
 	"github.com/kyleconroy/sqlc/internal/source"
+	"github.com/kyleconroy/sqlc/internal/sql/sqlerr"
 )
 
 type FileError struct {
@@ -30,6 +31,14 @@ func (e *Error) Add(filename, in string, loc int, err error) {
 			loc = lerr.Location
 		}
 	}
+	if lerr, ok := err.(*sqlerr.Error); ok {
+		if lerr.Location != 0 {
+			loc = lerr.Location
+		} else if lerr.Line != 0 && lerr.Column != 0 {
+			line = lerr.Line
+			column = lerr.Column
+		}
+	}
 	if in != "" && loc != 0 {
 		line, column = source.LineNumber(in, loc)
 	}

internal/sql/sqlerr/errors.go

@@ -14,6 +14,8 @@ type Error struct {
 	Code     string
 	Message  string
 	Location int
+	Line     int
+	Column   int
 	// Hint     string
 }