update

pingcap · Dec 29, 2023 · 331b601 · 331b601
1 parent a600ed1
commit 331b601
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 70 deletions.
diff --git a/pkg/parser/ast/dml.go b/pkg/parser/ast/dml.go
@@ -1554,7 +1554,6 @@ func (n *SelectStmt) Accept(v Visitor) (Node, bool) {
 type SetOprSelectList struct {
 	node
 
-	IsInBraces       bool
 	With             *WithClause
 	AfterSetOperator *SetOprType
 	Selects          []Node
@@ -1571,13 +1570,6 @@ func (n *SetOprSelectList) Restore(ctx *format.RestoreCtx) error {
 		}
 	}
 
-	if n.IsInBraces {
-		ctx.WritePlain("(")
-		defer func() {
-			ctx.WritePlain(")")
-		}()
-	}
-
 	for i, stmt := range n.Selects {
 		switch selectStmt := stmt.(type) {
 		case *SelectStmt:

diff --git a/pkg/parser/parser.go b/pkg/parser/parser.go
@@ -20010,60 +20010,39 @@ yynewstate:
 	case 1842:
 		{
 			var setOprList []ast.Node
-			var with *ast.WithClause
-			var limit *ast.Limit
-			var orderBy *ast.OrderByClause
 			switch x := yyS[yypt-1].expr.(*ast.SubqueryExpr).Query.(type) {
 			case *ast.SelectStmt:
-				setOprList = []ast.Node{x}
-				with = x.With
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 			case *ast.SetOprStmt:
-				setOprList = x.SelectList.Selects
-				with = x.With
-				limit = x.Limit
-				orderBy = x.OrderBy
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 			}
-			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 			setOpr.OrderBy = yyS[yypt-0].item.(*ast.OrderByClause)
 			parser.yyVAL.statement = setOpr
 		}
 	case 1843:
 		{
 			var setOprList []ast.Node
-			var with *ast.WithClause
-			var limit *ast.Limit
-			var orderBy *ast.OrderByClause
 			switch x := yyS[yypt-1].expr.(*ast.SubqueryExpr).Query.(type) {
 			case *ast.SelectStmt:
-				setOprList = []ast.Node{x}
-				with = x.With
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 			case *ast.SetOprStmt:
-				setOprList = x.SelectList.Selects
-				with = x.With
-				limit = x.Limit
-				orderBy = x.OrderBy
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 			}
-			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 			setOpr.Limit = yyS[yypt-0].item.(*ast.Limit)
 			parser.yyVAL.statement = setOpr
 		}
 	case 1844:
 		{
 			var setOprList []ast.Node
-			var with *ast.WithClause
-			var limit *ast.Limit
-			var orderBy *ast.OrderByClause
 			switch x := yyS[yypt-2].expr.(*ast.SubqueryExpr).Query.(type) {
 			case *ast.SelectStmt:
-				setOprList = []ast.Node{x}
-				with = x.With
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 			case *ast.SetOprStmt:
-				setOprList = x.SelectList.Selects
-				with = x.With
-				limit = x.Limit
-				orderBy = x.OrderBy
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 			}
-			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+			setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 			setOpr.OrderBy = yyS[yypt-1].item.(*ast.OrderByClause)
 			setOpr.Limit = yyS[yypt-0].item.(*ast.Limit)
 			parser.yyVAL.statement = setOpr
@@ -20095,7 +20074,7 @@ yynewstate:
 			case *ast.SelectStmt:
 				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 			case *ast.SetOprStmt:
-				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy, IsInBraces: true}}
+				setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 			}
 			parser.yyVAL.item = setOprList
 		}

diff --git a/pkg/parser/parser.y b/pkg/parser/parser.y
@@ -10339,60 +10339,39 @@ SetOprStmtWithLimitOrderBy:
 |	SubSelect OrderBy
 	{
 		var setOprList []ast.Node
-		var with *ast.WithClause
-		var limit *ast.Limit
-		var orderBy *ast.OrderByClause
 		switch x := $1.(*ast.SubqueryExpr).Query.(type) {
 		case *ast.SelectStmt:
-			setOprList = []ast.Node{x}
-			with = x.With
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 		case *ast.SetOprStmt:
-			setOprList = x.SelectList.Selects
-			with = x.With
-			limit = x.Limit
-			orderBy = x.OrderBy
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 		}
-		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 		setOpr.OrderBy = $2.(*ast.OrderByClause)
 		$$ = setOpr
 	}
 |	SubSelect SelectStmtLimit
 	{
 		var setOprList []ast.Node
-		var with *ast.WithClause
-		var limit *ast.Limit
-		var orderBy *ast.OrderByClause
 		switch x := $1.(*ast.SubqueryExpr).Query.(type) {
 		case *ast.SelectStmt:
-			setOprList = []ast.Node{x}
-			with = x.With
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 		case *ast.SetOprStmt:
-			setOprList = x.SelectList.Selects
-			with = x.With
-			limit = x.Limit
-			orderBy = x.OrderBy
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 		}
-		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 		setOpr.Limit = $2.(*ast.Limit)
 		$$ = setOpr
 	}
 |	SubSelect OrderBy SelectStmtLimit
 	{
 		var setOprList []ast.Node
-		var with *ast.WithClause
-		var limit *ast.Limit
-		var orderBy *ast.OrderByClause
 		switch x := $1.(*ast.SubqueryExpr).Query.(type) {
 		case *ast.SelectStmt:
-			setOprList = []ast.Node{x}
-			with = x.With
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 		case *ast.SetOprStmt:
-			setOprList = x.SelectList.Selects
-			with = x.With
-			limit = x.Limit
-			orderBy = x.OrderBy
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 		}
-		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList, With: with, Limit: limit, OrderBy: orderBy, IsInBraces: true}}
+		setOpr := &ast.SetOprStmt{SelectList: &ast.SetOprSelectList{Selects: setOprList}}
 		setOpr.OrderBy = $2.(*ast.OrderByClause)
 		setOpr.Limit = $3.(*ast.Limit)
 		$$ = setOpr
@@ -10429,7 +10408,7 @@ SetOprClause:
 		case *ast.SelectStmt:
 			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: []ast.Node{x}}}
 		case *ast.SetOprStmt:
-			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy, IsInBraces: true}}
+			setOprList = []ast.Node{&ast.SetOprSelectList{Selects: x.SelectList.Selects, With: x.With, Limit: x.Limit, OrderBy: x.OrderBy}}
 		}
 		$$ = setOprList
 	}