Skip to content

Commit b54729e

Browse files
committed
Fix CI failures: enum string formatting and query test expectations
- Fix ErrInvalidType formatting issue in enum.go - use fmt.Sprintf for type - Fix query test expectations: INSERT returns OkResult, not empty rows - Address multiple CI test failures with enum zero handling
1 parent be403bb commit b54729e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

enginetest/queries/script_queries.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9058,7 +9058,7 @@ where
90589058
{
90599059
// Test enum with explicit empty string - should allow 0
90609060
Query: "insert into t_empty values (0);",
9061-
Expected: []sql.Row{{}},
9061+
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
90629062
},
90639063
{
90649064
Query: "select e from t_empty;",
@@ -9079,7 +9079,7 @@ where
90799079
{
90809080
// In non-strict mode, 0 should be allowed and convert to empty string
90819081
Query: "insert into t values (0);",
9082-
Expected: []sql.Row{{}},
9082+
Expected: []sql.Row{{types.OkResult{RowsAffected: 1}}},
90839083
},
90849084
{
90859085
Query: "select e from t;",

sql/expression/enum.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
package expression
1515

1616
import (
17+
"fmt"
18+
1719
"github.com/dolthub/go-mysql-server/sql"
1820
"github.com/dolthub/go-mysql-server/sql/types"
1921
)
@@ -80,7 +82,7 @@ func (e *EnumToString) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
8082
case string:
8183
str = v
8284
default:
83-
return nil, sql.ErrInvalidType.New(val, types.Text)
85+
return nil, sql.ErrInvalidType.New(fmt.Sprintf("%T", val))
8486
}
8587
return str, nil
8688
}

0 commit comments

Comments
 (0)