Skip to content

Unwrap inputs to find_in_set function. #2934

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
Apr 14, 2025
Merged

Unwrap inputs to find_in_set function. #2934

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
0457998
Add test for find_in_set with text column.
nicktobey Apr 10, 2025
460ea84
Unwrap inputs to find_in_set
nicktobey Apr 10, 2025
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
23 changes: 23 additions & 0 deletions enginetest/queries/script_queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4694,6 +4694,16 @@ CREATE TABLE tab3 (
"insert into collate_tbl values (7, 'a,c');",
"insert into collate_tbl values (8, 'a,b,c');",

"create table text_tbl (i int primary key, s text);",
"insert into text_tbl values (0, '');",
"insert into text_tbl values (1, 'a');",
"insert into text_tbl values (2, 'b');",
"insert into text_tbl values (3, 'c');",
"insert into text_tbl values (4, 'a,b');",
"insert into text_tbl values (6, 'b,c');",
"insert into text_tbl values (7, 'a,c');",
"insert into text_tbl values (8, 'a,b,c');",

"create table enum_tbl (i int primary key, s enum('a','b','c'));",
"insert into enum_tbl values (0, 'a'), (1, 'b'), (2, 'c');",
"select i, s, find_in_set('a', s) from enum_tbl;",
Expand Down Expand Up @@ -4725,6 +4735,19 @@ CREATE TABLE tab3 (
{8, 1},
},
},
{
Query: "select i, find_in_set('a', s) from text_tbl;",
Expected: []sql.Row{
{0, 0},
{1, 1},
{2, 0},
{3, 0},
{4, 1},
{6, 0},
{7, 1},
{8, 1},
},
},
{
Query: "select i, find_in_set('a', s) from enum_tbl;",
Expected: []sql.Row{
Expand Down
8 changes: 8 additions & 0 deletions sql/expression/function/find_in_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@ func (f *FindInSet) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
return nil, nil
}

left, err = sql.UnwrapAny(ctx, left)
if err != nil {
return nil, err
}
lVal, _, err := types.LongText.Convert(ctx, left)
if err != nil {
return nil, err
Expand All @@ -103,6 +107,10 @@ func (f *FindInSet) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
}

var r string
right, err = sql.UnwrapAny(ctx, right)
if err != nil {
return nil, err
}
rType := f.RightChild.Type()
if setType, ok := rType.(types.SetType); ok {
// TODO: set type should take advantage of bit arithmetic
Expand Down