Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parser: call SetText correctly for CreateViewStmt #55520

Merged
merged 1 commit into from
Aug 21, 2024
Merged

parser: call SetText correctly for CreateViewStmt #55520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/parser/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions pkg/parser/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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
}

Expand Down Expand Up @@ -14033,7 +14033,7 @@ CreateBindingStmt:
{
x := &ast.CreateBindingStmt{
GlobalScope: $2.(bool),
PlanDigests: $9.([]*ast.StringOrUserVar),
PlanDigests: $9.([]*ast.StringOrUserVar),
}

$$ = x
Expand Down
10 changes: 10 additions & 0 deletions pkg/parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down