ignore hint when meet unknow token in hint (pingcap#80)

Author: lysu

ast/format_test.go

@@ -90,7 +90,7 @@ func (ts *testAstFormatSuite) TestAstFormat(c *C) {
 	for _, tt := range testcases {
 		expr := fmt.Sprintf("select %s", tt.input)
 		charset, collation := getDefaultCharsetAndCollate()
-		stmts, err := parser.New().Parse(expr, charset, collation)
+		stmts, _, err := parser.New().Parse(expr, charset, collation)
 		node := stmts[0].(*ast.SelectStmt).Fields.Fields[0].Expr
 		c.Assert(err, IsNil)
 

ast/misc_test.go

@@ -100,7 +100,7 @@ constraint foreign key (jobabbr) references ffxi_jobtype (jobabbr) on delete cas
 );
 `
 	parse := parser.New()
-	stmts, err := parse.Parse(sql, "", "")
+	stmts, _, err := parse.Parse(sql, "", "")
 	c.Assert(err, IsNil)
 	for _, stmt := range stmts {
 		stmt.Accept(visitor{})
@@ -119,7 +119,7 @@ show create table t;
 load data infile '/tmp/t.csv' into table t fields terminated by 'ab' enclosed by 'b';`
 
 	p := parser.New()
-	stmts, err := p.Parse(sql, "", "")
+	stmts, _, err := p.Parse(sql, "", "")
 	c.Assert(err, IsNil)
 	for _, stmt := range stmts {
 		stmt.Accept(visitor{})

bench_test.go

@@ -22,7 +22,7 @@ func BenchmarkSysbenchSelect(b *testing.B) {
 	sql := "SELECT pad FROM sbtest1 WHERE id=1;"
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		_, err := parser.Parse(sql, "", "")
+		_, _, err := parser.Parse(sql, "", "")
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -37,7 +37,7 @@ func BenchmarkParseComplex(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		for _, v := range table {
-			_, err := parser.Parse(v, "", "")
+			_, _, err := parser.Parse(v, "", "")
 			if err != nil {
 				b.Failed()
 			}
@@ -56,7 +56,7 @@ func BenchmarkParseSimple(b *testing.B) {
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		for _, v := range table {
-			_, err := parser.Parse(v, "", "")
+			_, _, err := parser.Parse(v, "", "")
 			if err != nil {
 				b.Failed()
 			}

goyacc/main.go

@@ -79,7 +79,7 @@
 //	type yyLexer interface {
 //		Lex(lval *yySymType) int
 //		Errorf(format string,  a ...interface{})
-//		Errors() []error
+//		Errors() (warns []error, errs []error)
 //	}
 //
 // Optionally the argument to yyParse may implement the following interface:
@@ -517,7 +517,7 @@ var %[1]sDebug = 0
 type %[1]sLexer interface {
 	Lex(lval *%[1]sSymType) int
 	Errorf(format string, a ...interface{})
-	Errors() []error
+	Errors() (warns []error, errs []error) 
 }
 
 type %[1]sLexerEx interface {

lexer.go

@@ -38,6 +38,7 @@ type Scanner struct {
 	buf bytes.Buffer
 
 	errs         []error
+	warns        []error
 	stmtStartPos int
 
 	// For scanning such kind of comment: /*! MySQL-specific code */ or /*+ optimizer hint */
@@ -88,16 +89,17 @@ func (s *optimizerHintScanner) scan() (tok int, pos Pos, lit string) {
 	return
 }
 
-// Errors returns the errors during a scan.
-func (s *Scanner) Errors() []error {
-	return s.errs
+// Errors returns the errors and warns during a scan.
+func (s *Scanner) Errors() (warns []error, errs []error) {
+	return s.warns, s.errs
 }
 
 // reset resets the sql string to be scanned.
 func (s *Scanner) reset(sql string) {
 	s.r = reader{s: sql, p: Pos{Line: 1}}
 	s.buf.Reset()
 	s.errs = s.errs[:0]
+	s.warns = s.warns[:0]
 	s.stmtStartPos = 0
 	s.specialComment = nil
 }