Skip to content

fix text storage for left and instr function #3018

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
Jun 9, 2025
Merged

fix text storage for left and instr function #3018

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3ce3c
fix text storage for left and instr function
Jun 9, 2025
63d7238
remove comment
Jun 9, 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
2 changes: 1 addition & 1 deletion enginetest/memory_engine_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func TestSingleScript(t *testing.T) {

for _, test := range scripts {
harness := enginetest.NewMemoryHarness("", 1, testNumPartitions, true, nil)
harness.UseServer()
//harness.UseServer()
engine, err := harness.NewEngine(t)
if err != nil {
panic(err)
Expand Down
29 changes: 29 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 @@ -8684,6 +8684,35 @@ where
},
},
},
{
// This is a script test here because every table in the harness setup data is in all lowercase
Copy link
Contributor

@nicktobey nicktobey Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure I understand what this comment is saying or what it means.

Copy link
Contributor Author

@jycor jycor Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, bad copy paste; will remove

Name: "substring function tests with wrappers",
Dialect: "mysql",
SetUpScript: []string{
"create table tbl (t text);",
"insert into tbl values ('abcdef');",
},
Assertions: []ScriptTestAssertion{
{
Query: "select left(t, 3) from tbl;",
Expected: []sql.Row{
{"abc"},
},
},
{
Query: "select right(t, 3) from tbl;",
Expected: []sql.Row{
{"def"},
},
},
{
Query: "select instr(t, 'bcd') from tbl;",
Expected: []sql.Row{
{2},
},
},
},
},
}

var SpatialScriptTests = []ScriptTest{
Expand Down
38 changes: 37 additions & 1 deletion sql/expression/function/substring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,20 @@ func (l Left) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
switch str := str.(type) {
case string:
text = []rune(str)
case sql.StringWrapper:
s, err := str.Unwrap(ctx)
if err != nil {
return nil, err
}
text = []rune(s)
case []byte:
text = []rune(string(str))
case sql.BytesWrapper:
b, err := str.Unwrap(ctx)
if err != nil {
return nil, err
}
text = []rune(string(b))
case nil:
return nil, nil
default:
Expand Down Expand Up @@ -583,8 +595,20 @@ func (i Instr) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
switch str := str.(type) {
case string:
text = []rune(str)
case sql.StringWrapper:
s, err := str.Unwrap(ctx)
if err != nil {
return nil, err
}
text = []rune(s)
case []byte:
text = []rune(string(str))
case sql.BytesWrapper:
s, err := str.Unwrap(ctx)
if err != nil {
return nil, err
}
text = []rune(string(s))
case nil:
return nil, nil
default:
Expand All @@ -600,8 +624,20 @@ func (i Instr) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
switch substr := substr.(type) {
case string:
subtext = []rune(substr)
case sql.StringWrapper:
s, err := substr.Unwrap(ctx)
if err != nil {
return nil, err
}
text = []rune(s)
case []byte:
subtext = []rune(string(subtext))
subtext = []rune(string(substr))
case sql.BytesWrapper:
s, err := substr.Unwrap(ctx)
if err != nil {
return nil, err
}
subtext = []rune(string(s))
case nil:
return nil, nil
default:
Expand Down