improve syntax error message (pingcap#175)

lyonzhi · Jan 21, 2019 · c8cc07b · c8cc07b
1 parent 5e663f8
commit c8cc07b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 20 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,7 +1,7 @@
 version: 2
 
 jobs:
-  build:
+  build-ut:
     docker:
       - image: golang:1.11
     working_directory: /go/src/github.com/pingcap/parser
@@ -19,12 +19,36 @@ jobs:
       - run:
           name: "Build & Test"
           command: make test
-      - run:
-          name: "Integration Test"
-          command: |
-            cd /go/src/github.com/pingcap/
-            git clone git@github.com:pingcap/tidb.git
-            cd tidb
-            rm go.sum
-            GO111MODULE=on go mod edit -replace github.com/pingcap/parser=github.com/${CIRCLE_PR_USERNAME:-$CIRCLE_PROJECT_USERNAME}/${CIRCLE_PR_REPONAME:-$CIRCLE_PROJECT_REPONAME}@$CIRCLE_SHA1
-            make test
+  build-integration:
+    docker:
+    - image: golang:1.11
+    working_directory: /go/src/github.com/pingcap/parser
+    steps:
+    - checkout
+    - run:
+        name: "Verify parser.go is up-to-date"
+        command: |
+          mv parser.go parser.go.committed
+          make parser
+          diff -u parser.go.committed parser.go
+    - run:
+        name: "Check code format"
+        command: make fmt
+    - run:
+        name: "Build"
+        command: make
+    - run:
+        name: "Integration Test"
+        command: |
+          cd /go/src/github.com/pingcap/
+          git clone git@github.com:pingcap/tidb.git
+          cd tidb
+          rm go.sum
+          GO111MODULE=on go mod edit -replace github.com/pingcap/parser=github.com/${CIRCLE_PR_USERNAME:-$CIRCLE_PROJECT_USERNAME}/${CIRCLE_PR_REPONAME:-$CIRCLE_PROJECT_REPONAME}@$CIRCLE_SHA1
+          make test
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+    - build-ut
+    - build-integration
diff --git a/lexer.go b/lexer.go
@@ -16,6 +16,7 @@ package parser
 import (
 	"bytes"
 	"fmt"
+	"strconv"
 	"strings"
 	"unicode"
 	"unicode/utf8"
@@ -50,6 +51,10 @@ type Scanner struct {
 	// It may break the compatibility when support those keywords,
 	// because some application may already use them as identifiers.
 	supportWindowFunc bool
+
+	// lastScanOffset indicates last offset returned by scan().
+	// It's used to substring sql in syntax error message.
+	lastScanOffset int
 }
 
 type specialCommentScanner interface {
@@ -123,17 +128,14 @@ func (s *Scanner) stmtText() string {
 // Scanner satisfies yyLexer interface which need this function.
 func (s *Scanner) Errorf(format string, a ...interface{}) {
 	str := fmt.Sprintf(format, a...)
-	col := s.r.p.Col
-	startPos := s.stmtStartPos
-	if s.r.s[startPos] == '\n' {
-		startPos++
-		col--
-	}
-	val := s.r.s[startPos:]
+	val := s.r.s[s.lastScanOffset:]
+	var lenStr = ""
 	if len(val) > 2048 {
+		lenStr = "(total length " + strconv.Itoa(len(val)) + ")"
 		val = val[:2048]
 	}
-	err := fmt.Errorf("line %d column %d near \"%s\"%s (total length %d)", s.r.p.Line, col, val, str, len(s.r.s))
+	err := fmt.Errorf("line %d column %d near \"%s\"%s %s",
+		s.r.p.Line, s.r.p.Col, val, str, lenStr)
 	s.errs = append(s.errs, err)
 }
 
@@ -144,6 +146,7 @@ func (s *Scanner) Errorf(format string, a ...interface{}) {
 // return invalid tells parser that scanner meets illegal character.
 func (s *Scanner) Lex(v *yySymType) int {
 	tok, pos, lit := s.scan()
+	s.lastScanOffset = pos.Offset
 	v.offset = pos.Offset
 	v.ident = lit
 	if tok == identifier {

diff --git a/mysql/errname.go b/mysql/errname.go
@@ -79,7 +79,7 @@ var MySQLErrName = map[uint16]string{
 	ErrDupKeyName:                               "Duplicate key name '%-.192s'",
 	ErrDupEntry:                                 "Duplicate entry '%-.192s' for key %d",
 	ErrWrongFieldSpec:                           "Incorrect column specifier for column '%-.192s'",
-	ErrParse:                                    "%s near '%-.80s' at line %d",
+	ErrParse:                                    "%s %s",
 	ErrEmptyQuery:                               "Query was empty",
 	ErrNonuniqTable:                             "Not unique table/alias: '%-.192s'",
 	ErrInvalidDefault:                           "Invalid default value for '%-.192s'",

diff --git a/yy_parser.go b/yy_parser.go
@@ -14,6 +14,7 @@
 package parser
 
 import (
+	"fmt"
 	"math"
 	"regexp"
 	"strconv"
@@ -159,7 +160,7 @@ func ParseErrorWith(errstr string, lineno int) error {
 	if len(errstr) > mysql.ErrTextLength {
 		errstr = errstr[:mysql.ErrTextLength]
 	}
-	return ErrParse.GenWithStackByArgs(mysql.MySQLErrName[mysql.ErrSyntax], errstr, lineno)
+	return fmt.Errorf("near '%-.80s' at line %d", errstr, lineno)
 }
 
 // The select statement is not at the end of the whole statement, if the last