parser: address comment.

ast/flag_test.go

@@ -80,7 +80,7 @@ func (ts *testFlagSuite) TestFlag(c *C) {
 		},
 	}
 	for _, ca := range cases {
-		stmt, err := parser.ParseOne("select "+ca.expr, "", "")
+		stmt, err := parser.ParseOneStmt("select "+ca.expr, "", "")
 		c.Assert(err, IsNil)
 		selectStmt := stmt.(*ast.SelectStmt)
 		ast.SetFlag(selectStmt)

ddl/ddl_test.go

@@ -338,7 +338,7 @@ func (ts *testSuite) TestAlterTableColumn(c *C) {
 
 func statement(ctx context.Context, sql string) stmt.Statement {
 	log.Debug("[ddl] Compile", sql)
-	s, _ := parser.ParseOne(sql, "", "")
+	s, _ := parser.ParseOneStmt(sql, "", "")
 	compiler := &executor.Compiler{}
 	stm, _ := compiler.Compile(ctx, s)
 	return stm

optimizer/evaluator/evaluator_test.go

@@ -39,7 +39,7 @@ type testEvaluatorSuite struct {
 }
 
 func parseExpr(c *C, expr string) ast.ExprNode {
-	s, err := parser.ParseOne("select "+expr, "", "")
+	s, err := parser.ParseOneStmt("select "+expr, "", "")
 	c.Assert(err, IsNil)
 	stmt := s.(*ast.SelectStmt)
 	return stmt.Fields.Fields[0].Expr

optimizer/plan/plan_test.go

@@ -231,7 +231,7 @@ func (s *testPlanSuite) TestBuilder(c *C) {
 		},
 	}
 	for _, ca := range cases {
-		s, err := parser.ParseOne(ca.sqlStr, "", "")
+		s, err := parser.ParseOneStmt(ca.sqlStr, "", "")
 		c.Assert(err, IsNil, Commentf("for expr %s", ca.sqlStr))
 		stmt := s.(*ast.SelectStmt)
 		mockResolve(stmt)
@@ -290,7 +290,7 @@ func (s *testPlanSuite) TestBestPlan(c *C) {
 		},
 	}
 	for _, ca := range cases {
-		s, err := parser.ParseOne(ca.sql, "", "")
+		s, err := parser.ParseOneStmt(ca.sql, "", "")
 		c.Assert(err, IsNil, Commentf("for expr %s", ca.sql))
 		stmt := s.(*ast.SelectStmt)
 		ast.SetFlag(stmt)

optimizer/resolver_test.go

@@ -95,7 +95,7 @@ func (ts *testNameResolverSuite) TestNameResolver(c *C) {
 	domain := sessionctx.GetDomain(ctx)
 	db.BindCurrentSchema(ctx, "test")
 	for _, tc := range resolverTestCases {
-		node, err := parser.ParseOne(tc.src, "", "")
+		node, err := parser.ParseOneStmt(tc.src, "", "")
 		c.Assert(err, IsNil)
 		resolveErr := optimizer.ResolveName(node, domain.InfoSchema(), ctx)
 		if tc.valid {

parser/parser_test.go

@@ -45,13 +45,13 @@ func (s *testParserSuite) TestSimple(c *C) {
 	}
 	for _, kw := range unreservedKws {
 		src := fmt.Sprintf("SELECT %s FROM tbl;", kw)
-		_, err := ParseOne(src, "", "")
+		_, err := ParseOneStmt(src, "", "")
 		c.Assert(err, IsNil, Commentf("source %s", src))
 	}
 
 	// Testcase for prepared statement
 	src := "SELECT id+?, id+? from t;"
-	_, err := ParseOne(src, "", "")
+	_, err := ParseOneStmt(src, "", "")
 	c.Assert(err, IsNil)
 
 	// Testcase for -- Comment and unary -- operator
@@ -62,7 +62,7 @@ func (s *testParserSuite) TestSimple(c *C) {
 
 	// Testcase for CONVERT(expr,type)
 	src = "SELECT CONVERT('111', SIGNED);"
-	st, err := ParseOne(src, "", "")
+	st, err := ParseOneStmt(src, "", "")
 	c.Assert(err, IsNil)
 	ss, ok := st.(*ast.SelectStmt)
 	c.Assert(ok, IsTrue)
@@ -80,7 +80,7 @@ func (s *testParserSuite) TestSimple(c *C) {
 		"SELECT CONVERT('111', SIGNED) /*comment*/;",
 	}
 	for _, src := range srcs {
-		st, err = ParseOne(src, "", "")
+		st, err = ParseOneStmt(src, "", "")
 		c.Assert(err, IsNil)
 		ss, ok = st.(*ast.SelectStmt)
 		c.Assert(ok, IsTrue)

parser/yy_parser.go

@@ -48,9 +48,9 @@ func Parse(sql, charset, collation string) ([]ast.StmtNode, error) {
 	return l.Stmts(), nil
 }
 
-// ParseOne parses a query and return the ast.StmtNode.
+// ParseOneStmt parses a query and return the ast.StmtNode.
 // The query must has one statement, otherwise ErrSyntax is returned.
-func ParseOne(sql, charset, collation string) (ast.StmtNode, error) {
+func ParseOneStmt(sql, charset, collation string) (ast.StmtNode, error) {
 	stmts, err := Parse(sql, charset, collation)
 	if err != nil {
 		return nil, errors.Trace(err)