parser: call SetText correctly for CreateViewStmt (#55520)

close #55441
pingcap · Aug 21, 2024 · 3464dae · 3464dae
1 parent 1f095a3
commit 3464dae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -16064,8 +16064,8 @@ yynewstate:
 	case 503:
 		{
 			startOffset := parser.startOffset(&yyS[yypt-1])
+			endOffset := parser.yylval.offset
 			selStmt := yyS[yypt-1].statement.(ast.StmtNode)
-			selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:]))
 			x := &ast.CreateViewStmt{
 				OrReplace: yyS[yypt-9].item.(bool),
 				ViewName:  yyS[yypt-4].item.(*ast.TableName),
@@ -16079,11 +16079,11 @@ yynewstate:
 			}
 			if yyS[yypt-0].item != nil {
 				x.CheckOption = yyS[yypt-0].item.(model.ViewCheckOption)
-				endOffset := parser.startOffset(&yyS[yypt])
-				selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:endOffset]))
+				endOffset = parser.startOffset(&yyS[yypt])
 			} else {
 				x.CheckOption = model.CheckOptionCascaded
 			}
+			selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:endOffset]))
 			parser.yyVAL.statement = x
 		}
 	case 504:

diff --git a/pkg/parser/parser.y b/pkg/parser/parser.y
@@ -5002,8 +5002,8 @@ CreateViewStmt:
 	"CREATE" OrReplace ViewAlgorithm ViewDefiner ViewSQLSecurity "VIEW" ViewName ViewFieldList "AS" CreateViewSelectOpt ViewCheckOption
 	{
 		startOffset := parser.startOffset(&yyS[yypt-1])
+		endOffset := parser.yylval.offset
 		selStmt := $10.(ast.StmtNode)
-		selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:]))
 		x := &ast.CreateViewStmt{
 			OrReplace: $2.(bool),
 			ViewName:  $7.(*ast.TableName),
@@ -5017,11 +5017,11 @@ CreateViewStmt:
 		}
 		if $11 != nil {
 			x.CheckOption = $11.(model.ViewCheckOption)
-			endOffset := parser.startOffset(&yyS[yypt])
-			selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:endOffset]))
+			endOffset = parser.startOffset(&yyS[yypt])
 		} else {
 			x.CheckOption = model.CheckOptionCascaded
 		}
+		selStmt.SetText(parser.lexer.client, strings.TrimSpace(parser.src[startOffset:endOffset]))
 		$$ = x
 	}
 
@@ -14033,7 +14033,7 @@ CreateBindingStmt:
 	{
 		x := &ast.CreateBindingStmt{
 			GlobalScope: $2.(bool),
-			PlanDigests:  $9.([]*ast.StringOrUserVar),
+			PlanDigests: $9.([]*ast.StringOrUserVar),
 		}
 
 		$$ = x

diff --git a/pkg/parser/parser_test.go b/pkg/parser/parser_test.go
@@ -5744,6 +5744,16 @@ func TestView(t *testing.T) {
 	require.Equal(t, "select c,d,e from t", v.Select.Text())
 	require.Equal(t, model.SecurityDefiner, v.Security)
 	require.Equal(t, model.CheckOptionCascaded, v.CheckOption)
+
+	src = `
+CREATE VIEW v1 AS SELECT * FROM t;
+CREATE VIEW v2 AS SELECT 123123123123123;
+`
+	nodes, _, err := p.Parse(src, "", "")
+	require.NoError(t, err)
+	require.Len(t, nodes, 2)
+	require.Equal(t, nodes[0].(*ast.CreateViewStmt).Select.Text(), "SELECT * FROM t")
+	require.Equal(t, nodes[1].(*ast.CreateViewStmt).Select.Text(), "SELECT 123123123123123")
 }
 
 func TestTimestampDiffUnit(t *testing.T) {