Skip to content

Allow set to have scope for each setting #6494

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
systay merged 1 commit into from
Jul 30, 2020
Merged

Allow set to have scope for each setting #6494

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
12 changes: 6 additions & 6 deletions go/test/endtoend/vtgate/setstatement/sysvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestCharsetIntro(t *testing.T) {
require.EqualValues(t, 0, qr.RowsAffected)
}

func TestSetSysVar(t *testing.T) {
func TestSetSysVarSingle(t *testing.T) {
defer cluster.PanicHandler(t)
ctx := context.Background()
vtParams := mysql.ConnParams{
Expand Down Expand Up @@ -103,14 +103,14 @@ func TestSetSystemVariable(t *testing.T) {
require.NoError(t, err)
defer conn.Close()

checkedExec(t, conn, "set @@sql_mode = 'NO_ZERO_DATE'")
q := `select str_to_date('00/00/0000', '%m/%d/%Y')`
assertMatches(t, conn, q, `[[NULL]]`)
checkedExec(t, conn, "set session sql_mode = 'NO_ZERO_DATE', session default_week_format = 1")
q := `select str_to_date('00/00/0000', '%m/%d/%Y'), WEEK('2008-02-20')`
assertMatches(t, conn, q, `[[NULL INT64(8)]]`)

assertMatches(t, conn, "select @@sql_mode", `[[VARCHAR("NO_ZERO_DATE")]]`)
checkedExec(t, conn, "set @@sql_mode = ''")
checkedExec(t, conn, "set @@sql_mode = '', session default_week_format = 0")

assertMatches(t, conn, q, `[[DATE("0000-00-00")]]`)
assertMatches(t, conn, q, `[[DATE("0000-00-00") INT64(7)]]`)

checkedExec(t, conn, "SET @@SESSION.sql_mode = CONCAT(CONCAT(@@sql_mode, ',STRICT_ALL_TABLES'), ',NO_AUTO_VALUE_ON_ZERO'), @@SESSION.sql_auto_is_null = 0, @@SESSION.wait_timeout = 2147483")
assertMatches(t, conn, "select @@sql_mode", `[[VARCHAR("NO_AUTO_VALUE_ON_ZERO,STRICT_ALL_TABLES")]]`)
Expand Down
6 changes: 6 additions & 0 deletions go/vt/sqlparser/parse_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,12 @@ var (
}, {
input: "set session wait_timeout = 3600",
output: "set session wait_timeout = 3600",
}, {
input: "set session wait_timeout = 3600, session autocommit = off",
output: "set session wait_timeout = 3600, session autocommit = 'off'",
}, {
input: "set session wait_timeout = 3600, @@global.autocommit = off",
output: "set session wait_timeout = 3600, @@global.autocommit = 'off'",
}, {
input: "set /* list */ a = 3, b = 4",
}, {
Expand Down
Loading