Skip to content

Fix panic for WHERE filter over SHOW VARIABLES #1892

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 3 commits into from
Jul 25, 2023
Merged

Fix panic for WHERE filter over SHOW VARIABLES #1892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e055e91
fix for panic
Jul 24, 2023
7d72fe4
adding tests
Jul 24, 2023
1bca9d3
[ga-format-pr] Run ./format_repo.sh to fix formatting
jcor11599 Jul 24, 2023
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
14 changes: 14 additions & 0 deletions enginetest/queries/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4996,6 +4996,20 @@ Select * from (
{"version_comment", "Dolt"}, {"version_compile_machine", ""}, {"version_compile_os", ""}, {"version_compile_zlib", ""}, {"wait_timeout", 28800}, {"windowing_use_high_precision", 1},
},
},
{
Query: `SHOW VARIABLES WHERE "1" and variable_name = 'autocommit'`,
Expected: []sql.Row{
{"autocommit", 1},
},
},
{
Query: `SHOW VARIABLES WHERE "0" and variable_name = 'autocommit'`,
Expected: []sql.Row{},
},
{
Query: `SHOW VARIABLES WHERE "abc" and variable_name = 'autocommit'`,
Expected: []sql.Row{},
},
{
Query: `SHOW GLOBAL VARIABLES LIKE '%mode'`,
Expected: []sql.Row{
Expand Down
7 changes: 6 additions & 1 deletion sql/rowexec/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,12 @@ func (b *BaseBuilder) buildShowVariables(ctx *sql.Context, n *plan.ShowVariables
if err != nil {
return nil, err
}
if !res.(bool) {
res, _, err = types.Boolean.Convert(res)
if err != nil {
ctx.Warn(1292, err.Error())
continue
}
if res.(int8) == 0 {
continue
}
}
Expand Down