Skip to content

Converting a nil value should return nil, not panic. #2927

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 1 commit into from
Apr 8, 2025
Merged

Converting a nil value should return nil, not panic. #2927

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
11 changes: 11 additions & 0 deletions enginetest/queries/queries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5206,6 +5206,17 @@ SELECT * FROM cte WHERE d = 2;`,
Query: "SELECT CAST(-3 AS DOUBLE) FROM dual",
Expected: []sql.Row{{-3.0}},
},
{
Query: "SELECT BINARY c, BINARY vc, BINARY t, BINARY b, BINARY vb, BINARY bl FROM niltexttable",
Expected: []sql.Row{
{nil, nil, nil, nil, nil, nil},
{[]byte("2"), nil, []byte("2"), nil, []byte("2"), nil},
{nil, []byte("3"), []byte("3"), nil, nil, []byte("3")},
{[]byte("4"), []byte("4"), nil, []byte("4\x00"), nil, nil},
{nil, nil, nil, []byte("5\x00"), []byte("5"), []byte("5")},
{[]byte("6"), []byte("6"), []byte("6"), []byte("6\x00"), []byte("6"), []byte("6")},
},
},
{
Query: `SELECT CONVERT("-3.9876", FLOAT) FROM dual`,
Expected: []sql.Row{{float32(-3.9876)}},
Expand Down
23 changes: 23 additions & 0 deletions enginetest/scriptgen/setup/scripts/niltable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,26 @@ insert into niltable values
exec
create index niltable_i2 on niltable (i2)
----

exec
CREATE TABLE `niltexttable` (
`i` bigint NOT NULL,
`c` char(2),
`vc` varchar(2),
`t` text,
`b` binary(2),
`vb` varbinary(2),
`bl` blob,
PRIMARY KEY (`i`)
)
----

exec
insert into niltexttable values
(1, null, null, null, null, null, null),
(2, '2', null, '2', null, '2', null),
(3, null, '3', '3', null, null, '3'),
(4, '4', '4', null, '4', null, null),
(5, null, null, null, '5', '5', '5'),
(6, '6', '6', '6', '6', '6', '6')
----
8 changes: 8 additions & 0 deletions enginetest/scriptgen/setup/setup_data.sg.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sql/expression/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,9 @@ func (c *Convert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
// converted type where applicable (e.g. Char conversion supports only |typeLength|, Decimal conversion supports
// |typeLength| and |typeScale|).
func convertValue(ctx *sql.Context, val interface{}, castTo string, originType sql.Type, typeLength, typeScale int) (interface{}, error) {
if val == nil {
return nil, nil
}
switch strings.ToLower(castTo) {
case ConvertToBinary:
b, _, err := types.LongBlob.Convert(ctx, val)
Expand Down
Loading