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

parser: support := in the set syntax #8018

Merged
merged 4 commits into from
Oct 24, 2018
Merged

parser: support := in the set syntax #8018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8052f56
parser: support `:=` in the `set` syntax
tiancaiamao Oct 23, 2018
483db56
Merge branch 'master' into parse-assign-eq
lysu Oct 23, 2018
cd591f2
Merge branch 'master' into parse-assign-eq
ngaut Oct 24, 2018
bf4e8dd
Merge branch 'master' into parse-assign-eq
zz-jason Oct 24, 2018
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
31 changes: 17 additions & 14 deletions parser/parser.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ import (
TableOptimizerHintList "Table level optimizer hint list"

%type <ident>
EQOrAssignmentEQ "= or :="
AsOpt "AS or EmptyString"
KeyOrIndex "{KEY|INDEX}"
ColumnKeywordOpt "Column keyword or empty"
Expand Down Expand Up @@ -4926,11 +4927,11 @@ SetStmt:
{
$$ = &ast.SetStmt{Variables: $2.([]*ast.VariableAssignment)}
}
| "SET" "PASSWORD" eq PasswordOpt
| "SET" "PASSWORD" EQOrAssignmentEQ PasswordOpt
{
$$ = &ast.SetPwdStmt{Password: $4.(string)}
}
| "SET" "PASSWORD" "FOR" Username eq PasswordOpt
| "SET" "PASSWORD" "FOR" Username EQOrAssignmentEQ PasswordOpt
{
$$ = &ast.SetPwdStmt{User: $4.(*auth.UserIdentity), Password: $6.(string)}
}
Expand Down Expand Up @@ -5026,23 +5027,23 @@ SetExpr:
| ExprOrDefault

VariableAssignment:
Identifier eq SetExpr
Identifier EQOrAssignmentEQ SetExpr
{
$$ = &ast.VariableAssignment{Name: $1, Value: $3, IsSystem: true}
}
| "GLOBAL" Identifier eq SetExpr
| "GLOBAL" Identifier EQOrAssignmentEQ SetExpr
{
$$ = &ast.VariableAssignment{Name: $2, Value: $4, IsGlobal: true, IsSystem: true}
}
| "SESSION" Identifier eq SetExpr
| "SESSION" Identifier EQOrAssignmentEQ SetExpr
{
$$ = &ast.VariableAssignment{Name: $2, Value: $4, IsSystem: true}
}
| "LOCAL" Identifier eq Expression
| "LOCAL" Identifier EQOrAssignmentEQ Expression
{
$$ = &ast.VariableAssignment{Name: $2, Value: $4, IsSystem: true}
}
| doubleAtIdentifier eq SetExpr
| doubleAtIdentifier EQOrAssignmentEQ SetExpr
{
v := strings.ToLower($1)
var isGlobal bool
Expand All @@ -5058,13 +5059,7 @@ VariableAssignment:
}
$$ = &ast.VariableAssignment{Name: v, Value: $3, IsGlobal: isGlobal, IsSystem: true}
}
| singleAtIdentifier eq Expression
{
v := $1
v = strings.TrimPrefix(v, "@")
$$ = &ast.VariableAssignment{Name: v, Value: $3}
}
| singleAtIdentifier assignmentEq Expression
| singleAtIdentifier EQOrAssignmentEQ Expression
{
v := $1
v = strings.TrimPrefix(v, "@")
Expand Down Expand Up @@ -5197,6 +5192,14 @@ AuthString:
$$ = $1
}

EQOrAssignmentEQ:
eq
{
}
| assignmentEq
{
}

/****************************Admin Statement*******************************/
AdminStmt:
"ADMIN" "SHOW" "DDL"
Expand Down
11 changes: 11 additions & 0 deletions parser/parser_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,19 +584,28 @@ func (s *testParserSuite) TestDBAStmt(c *C) {
{"SET @_e._$. = 1", true},
{"SET @~f = 1", false},
{"SET @`g,` = 1", true},
{"SET @`g,` := 1", true},
// session system variables
{"SET SESSION autocommit = 1", true},
{"SET SESSION autocommit := 1", true},
{"SET @@session.autocommit = 1", true},
{"SET @@session.autocommit := 1", true},
{"SET @@SESSION.autocommit = 1", true},
{"SET @@GLOBAL.GTID_PURGED = '123'", true},
{"SET @MYSQLDUMP_TEMP_LOG_BIN = @@SESSION.SQL_LOG_BIN", true},
{"SET @MYSQLDUMP_TEMP_LOG_BIN := @@SESSION.SQL_LOG_BIN", true},
{"SET LOCAL autocommit = 1", true},
{"SET LOCAL autocommit := 1", true},
{"SET @@local.autocommit = 1", true},
{"SET @@autocommit = 1", true},
{"SET @@SQL_MODE := ''", true},
{"SET autocommit = 1", true},
{"SET autocommit := 1", true},
// global system variables
{"SET GLOBAL autocommit = 1", true},
{"SET GLOBAL autocommit := 1", true},
{"SET @@global.autocommit = 1", true},
{"SET @@global.autocommit := 1", true},
// set default value
{"SET @@global.autocommit = default", true},
{"SET @@session.autocommit = default", true},
Expand All @@ -605,7 +614,9 @@ func (s *testParserSuite) TestDBAStmt(c *C) {
{"SET CHARACTER SET 'utf8mb4';", true},
// set password
{"SET PASSWORD = 'password';", true},
{"SET PASSWORD := 'password';", true},
{"SET PASSWORD FOR 'root'@'localhost' = 'password';", true},
{"SET PASSWORD FOR 'root'@'localhost' := 'password';", true},
// SET TRANSACTION Syntax
{"SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ", true},
{"SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ", true},
Expand Down