Skip to content

fix: strip trailing semicolon from ALTER statement options #1734

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
CsongSY wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: strip trailing semicolon from ALTER statement options #1734

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
5 changes: 5 additions & 0 deletions go/sql/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ func (atp *AlterTableParser) ParseAlterStatement(alterStatement string) (err err
break
}
}
// Strip any trailing statement terminator. A trailing semicolon would
// otherwise be carried into alterStatementOptions and, when the options are
// spliced into a larger statement (e.g. appending ", ALGORITHM=INSTANT"),
// break it into two statements under multiStatements=true.
atp.alterStatementOptions = strings.TrimRight(atp.alterStatementOptions, "; \t\r\n")
for _, alterToken := range atp.tokenizeAlterStatement(atp.alterStatementOptions) {
alterToken = atp.sanitizeQuotesFromAlterStatement(alterToken)
atp.parseAlterToken(alterToken)
Expand Down
21 changes: 21 additions & 0 deletions go/sql/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,27 @@ func TestParseAlterStatement(t *testing.T) {
require.False(t, parser.IsAutoIncrementDefined())
}

func TestParseAlterStatementTrailingSemicolon(t *testing.T) {
statements := []string{
"add column t int;",
"add column t int ;",
"add column t int; \t\r\n",
"ADD KEY idx_username (`username`);",
}
expected := []string{
"add column t int",
"add column t int",
"add column t int",
"ADD KEY idx_username (`username`)",
}
for i, statement := range statements {
parser := NewAlterTableParser()
err := parser.ParseAlterStatement(statement)
require.NoError(t, err)
require.Equal(t, expected[i], parser.alterStatementOptions)
}
}

func TestParseAlterStatementrivialRename(t *testing.T) {
statement := "add column t int, change ts ts timestamp, engine=innodb"
parser := NewAlterTableParser()
Expand Down