rm extra conversions

Author: elianddb

enginetest/queries/script_queries.go

@@ -133,7 +133,8 @@ var ScriptTests = []ScriptTest{
 				Query: `SELECT archived FROM report_card WHERE id = 1
 					UNION ALL  
 					SELECT 48 FROM report_card WHERE id = 1`,
-				Expected: []sql.Row{{int64(0)}, {int64(48)}},
+				Expected:                      []sql.Row{{int64(0)}, {int64(48)}},
+				SkipResultCheckOnServerEngine: true,
 			},
 		},
 	},
@@ -182,9 +183,10 @@ var ScriptTests = []ScriptTest{
 					WHERE archived = FALSE AND id <> 1
 				) AS dummy_alias`,
 				Expected: []sql.Row{
-					{int64(5), int64(1), "Card1", int64(0), int64(0), int64(2)},
+					{int64(5), int64(1), "Card1", int64(0), uint64(0), int64(2)},
 					{int64(7), int64(2), "Collection1", int64(0), nil, int64(2)},
 				},
+				SkipResultCheckOnServerEngine: true,
 			},
 		},
 	},

sql/expression/convert.go

@@ -123,9 +123,6 @@ func GetConvertToType(l, r sql.Type) string {
 	if types.IsDecimal(l) || types.IsDecimal(r) {
 		return ConvertToDecimal
 	}
-	if types.IsBit(l) || types.IsBit(r) {
-		return ConvertToSigned
-	}
 	if types.IsUnsigned(l) && types.IsUnsigned(r) {
 		return ConvertToUnsigned
 	}

sql/iters/rel_iters.go

@@ -601,9 +601,8 @@ func (di *distinctIter) Dispose() {
 }
 
 type UnionIter struct {
-	Cur          sql.RowIter
-	NextIter     func(ctx *sql.Context) (sql.RowIter, error)
-	ResultSchema sql.Schema
+	Cur      sql.RowIter
+	NextIter func(ctx *sql.Context) (sql.RowIter, error)
 }
 
 func (ui *UnionIter) Next(ctx *sql.Context) (sql.Row, error) {
@@ -621,23 +620,8 @@ func (ui *UnionIter) Next(ctx *sql.Context) (sql.Row, error) {
 		if err != nil {
 			return nil, err
 		}
-		res, err = ui.Cur.Next(ctx)
-		if err != nil {
-			return nil, err
-		}
+		return ui.Cur.Next(ctx)
 	}
-
-	// Convert BIT values to Int64 when schema generalization changed types for server engine compatibility
-	if ui.ResultSchema != nil {
-		for i, val := range res {
-			if i < len(ui.ResultSchema) && val != nil {
-				if converted, _, err := ui.ResultSchema[i].Type.Convert(ctx, val); err == nil {
-					res[i] = converted
-				}
-			}
-		}
-	}
-
 	return res, err
 }
 

sql/plan/set_op.go

@@ -19,7 +19,6 @@ import (
 	"strings"
 
 	"github.com/dolthub/go-mysql-server/sql"
-	"github.com/dolthub/go-mysql-server/sql/types"
 )
 
 const (
@@ -101,7 +100,6 @@ func (s *SetOp) Schema() sql.Schema {
 	for i := range ls {
 		c := *ls[i]
 		if i < len(rs) {
-			c.Type = types.GeneralizeTypes(ls[i].Type, rs[i].Type)
 			c.Nullable = ls[i].Nullable || rs[i].Nullable
 		}
 		ret[i] = &c

sql/rowexec/rel.go

@@ -813,7 +813,6 @@ func (b *BaseBuilder) buildSetOp(ctx *sql.Context, s *plan.SetOp, row sql.Row) (
 			NextIter: func(ctx *sql.Context) (sql.RowIter, error) {
 				return b.buildNodeExec(ctx, s.Right(), row)
 			},
-			ResultSchema: s.Schema(),
 		}
 	case plan.IntersectType:
 		var iter2 sql.RowIter

sql/types/bit.go

@@ -193,11 +193,6 @@ func (t BitType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
 	if v == nil {
 		return sqltypes.NULL, nil
 	}
-
-	// Delegate int64 values to Int64.SQL to prevent server engine []uint8 serialization errors
-	if int64Val, ok := v.(int64); ok {
-		return Int64.SQL(ctx, dest, int64Val)
-	}
 	value, _, err := t.Convert(ctx, v)
 	if err != nil {
 		return sqltypes.Value{}, err

sql/types/conversion.go

@@ -637,11 +637,6 @@ func generalizeNumberTypes(a, b sql.Type) sql.Type {
 // TODO: Create and handle "Illegal mix of collations" error
 // TODO: Handle extended types, like DoltgresType
 func GeneralizeTypes(a, b sql.Type) sql.Type {
-	// BIT types must convert to Int64 in UNION to avoid server engine serialization errors with []uint8
-	if (IsBit(a) || IsBit(b)) && (IsBit(a) && IsBit(b) || IsNullType(a) || IsNullType(b)) {
-		return Int64
-	}
-
 	if reflect.DeepEqual(a, b) {
 		return a
 	}