Skip to content

Bug fix: Set non-boolean system variable enum values to 'ON' or 'OFF' #2394

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
Mar 14, 2024
Merged

Bug fix: Set non-boolean system variable enum values to 'ON' or 'OFF' #2394

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
4386fa0
Bug fix for setting non-boolean system variable enum values to 'ON'/'…
fulghum Mar 14, 2024
f7c60dd
Moving nil check up to simplify if condition
fulghum Mar 14, 2024
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
18 changes: 18 additions & 0 deletions enginetest/enginetests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3871,6 +3871,24 @@ func TestVariables(t *testing.T, harness Harness) {
Query: "SELECT @@GLOBAL.select_into_buffer_size",
Expected: []sql.Row{{9002}},
},
{
// For boolean types, OFF/ON is converted
Query: "SET @@GLOBAL.activate_all_roles_on_login = 'ON'",
Expected: []sql.Row{{}},
},
{
Query: "SELECT @@GLOBAL.activate_all_roles_on_login",
Expected: []sql.Row{{1}},
},
{
// For non-boolean types, OFF/ON is not converted
Query: "SET @@GLOBAL.delay_key_write = 'OFF'",
Expected: []sql.Row{{}},
},
{
Query: "SELECT @@GLOBAL.delay_key_write",
Expected: []sql.Row{{"OFF"}},
},
} {
t.Run(assertion.Query, func(t *testing.T) {
TestQueryWithContext(t, ctx1, engine, harness, assertion.Query, assertion.Expected, nil, nil)
Expand Down
28 changes: 16 additions & 12 deletions sql/planbuilder/set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"fmt"
"strings"

"github.com/dolthub/vitess/go/sqltypes"
ast "github.com/dolthub/vitess/go/vt/sqlparser"

"github.com/dolthub/go-mysql-server/sql"
Expand Down Expand Up @@ -243,22 +244,25 @@ func (b *Builder) simplifySetExpr(name *ast.ColName, varScope ast.SetScope, val
return nil, false
}

switch strings.ToLower(setVal) {
case ast.KeywordString(ast.ON):
return expression.NewLiteral(true, types.Boolean), true
case ast.KeywordString(ast.TRUE):
return expression.NewLiteral(true, types.Boolean), true
case ast.KeywordString(ast.OFF):
return expression.NewLiteral(false, types.Boolean), true
case ast.KeywordString(ast.FALSE):
return expression.NewLiteral(false, types.Boolean), true
default:
}

if sysVarType == nil {
return nil, false
}

// If we're targeting a boolean type (likely if we see an INT8 sys var),
// convert a few common string values to boolean values.
if sysVarType.Type() == sqltypes.Int8 {
switch strings.ToLower(setVal) {
case ast.KeywordString(ast.ON):
return expression.NewLiteral(true, types.Boolean), true
case ast.KeywordString(ast.TRUE):
return expression.NewLiteral(true, types.Boolean), true
case ast.KeywordString(ast.OFF):
return expression.NewLiteral(false, types.Boolean), true
case ast.KeywordString(ast.FALSE):
return expression.NewLiteral(false, types.Boolean), true
}
}

enum, _, err := sysVarType.Convert(setVal)
if err != nil {
b.handleErr(err)
Expand Down