Skip to content

Commit a322dd6

Browse files
committed
Merge branch 'angela/setconversion' of https://github.com/dolthub/go-mysql-server into angela/emptystringset
2 parents cf26050 + ec4cff6 commit a322dd6

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

enginetest/queries/script_queries.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9819,6 +9819,7 @@ where
98199819
},
98209820
},
98219821
{
9822+
// https://github.com/dolthub/dolt/issues/9510
98229823
Skip: true,
98239824
Query: "select s from t where s like 'a%' order by s;",
98249825
Expected: []sql.Row{
@@ -9909,6 +9910,7 @@ where
99099910
},
99109911
},
99119912
{
9913+
// https://github.com/dolthub/dolt/issues/9511
99129914
Skip: true,
99139915
Query: "select s, cast(s as char) from t order by s;",
99149916
Expected: []sql.Row{
@@ -9918,6 +9920,7 @@ where
99189920
},
99199921
},
99209922
{
9923+
// https://github.com/dolthub/dolt/issues/9511
99219924
Skip: true,
99229925
Query: "select s, cast(s as binary) from t order by s;",
99239926
Expected: []sql.Row{

sql/types/conversion.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -736,6 +736,9 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
736736
return LongText
737737
}
738738

739+
// TypeAwareConversion converts a value to a specified type, with awareness of the value's original type. This is
740+
// necessary because some types, such as EnumType and SetType, are stored as ints and require information from the
741+
// original type to properly convert to strings.
739742
func TypeAwareConversion(ctx *sql.Context, val interface{}, originalType sql.Type, convertedType sql.Type) (interface{}, error) {
740743
if val == nil {
741744
return nil, nil

0 commit comments

Comments
 (0)