Skip to content

parser: fix compile error with mod function #59017

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

Merged
merged 2 commits into from
Feb 10, 2025
Merged

parser: fix compile error with mod function #59017

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
bae5524
parser: fix compile error with mod function
Defined2014 Jan 17, 2025
180a0e2
update
Defined2014 Feb 8, 2025
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
9 changes: 9 additions & 0 deletions pkg/parser/ast/expressions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ type BetweenExpr struct {

// Restore implements Node interface.
func (n *BetweenExpr) Restore(ctx *format.RestoreCtx) error {
if ctx.Flags.HasRestoreBracketAroundBetweenExpr() {
ctx.WritePlain("(")
}
if err := n.Expr.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore BetweenExpr.Expr")
}
Expand All @@ -100,6 +103,9 @@ func (n *BetweenExpr) Restore(ctx *format.RestoreCtx) error {
if err := n.Right.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred while restore BetweenExpr.Right ")
}
if ctx.Flags.HasRestoreBracketAroundBetweenExpr() {
ctx.WritePlain(")")
}
return nil
}

Expand Down Expand Up @@ -172,8 +178,10 @@ func restoreBinaryOpWithSpacesAround(ctx *format.RestoreCtx, op opcode.Op) error

// Restore implements Node interface.
func (n *BinaryOperationExpr) Restore(ctx *format.RestoreCtx) error {
originalFlags := ctx.Flags
if ctx.Flags.HasRestoreBracketAroundBinaryOperation() {
ctx.WritePlain("(")
ctx.Flags |= format.RestoreBracketAroundBetweenExpr
}
if err := n.L.Restore(ctx); err != nil {
return errors.Annotate(err, "An error occurred when restore BinaryOperationExpr.L")
Expand All @@ -186,6 +194,7 @@ func (n *BinaryOperationExpr) Restore(ctx *format.RestoreCtx) error {
}
if ctx.Flags.HasRestoreBracketAroundBinaryOperation() {
ctx.WritePlain(")")
ctx.Flags = originalFlags
}
return nil
}
Expand Down
8 changes: 8 additions & 0 deletions pkg/parser/format/format.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ const (
RestoreWithoutSchemaName
RestoreWithoutTableName
RestoreForNonPrepPlanCache

RestoreBracketAroundBetweenExpr
)

const (
Expand Down Expand Up @@ -323,6 +325,12 @@ func (rf RestoreFlags) HasStringWithoutDefaultCharset() bool {
return rf.has(RestoreStringWithoutDefaultCharset)
}

// HasRestoreBracketAroundBetweenExpr returns a boolean indicating
// whether `rf` has `RestoreBracketAroundBetweenExpr` flag.
func (rf RestoreFlags) HasRestoreBracketAroundBetweenExpr() bool {
return rf.has(RestoreBracketAroundBetweenExpr)
}

// HasStringWithoutCharset returns a boolean indicating whether `rf` has `RestoreStringWithoutCharset` flag.
func (rf RestoreFlags) HasStringWithoutCharset() bool {
return rf.has(RestoreStringWithoutCharset)
Expand Down
Loading