Skip to content

ast: reset JoinLevel at the beginning of TableRefsClause.Restore #1036

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

Open
Hexilee wants to merge 2 commits into
base: master
Choose a base branch
from
Open

ast: reset JoinLevel at the beginning of TableRefsClause.Restore #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3585ad
reset JoinLevel in TableRefsClause.Restore
Hexilee Sep 21, 2020
2b76437
Merge branch 'master' into master
Hexilee Sep 21, 2020
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
5 changes: 5 additions & 0 deletions ast/dml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,11 @@ type TableRefsClause struct {

// Restore implements Node interface.
func (n *TableRefsClause) Restore(ctx *format.RestoreCtx) error {
level := ctx.JoinLevel
ctx.JoinLevel = 0
defer func() {
ctx.JoinLevel = level
}()
if err := n.TableRefs.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore TableRefsClause.TableRefs")
}
Expand Down
1 change: 1 addition & 0 deletions ast/dml_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ func (ts *testDMLSuite) TestTableRefsClauseRestore(c *C) {
{"t", "`t`"},
{"t1 join t2", "`t1` JOIN `t2`"},
{"t1, t2", "(`t1`) JOIN `t2`"},
{"(select * from (select * from t1) as tmp) as tmp", "(SELECT * FROM (SELECT * FROM `t1`) AS `tmp`) AS `tmp`"},
}
extractNodeFunc := func(node Node) Node {
return node.(*SelectStmt).From
Expand Down