add test ability to see bit nums

Author: elianddb

enginetest/server_engine.go

@@ -378,6 +378,16 @@ func rowIterForGoSqlRows(ctx *sql.Context, sch sql.Schema, rows *gosql.Rows) (sq
 func convertValue(ctx *sql.Context, sch sql.Schema, row sql.Row) sql.Row {
 	for i, col := range sch {
 		switch col.Type.Type() {
+		case query.Type_BIT:
+			if row[i] != nil {
+				if bytes, ok := row[i].([]byte); ok {
+					if bt, ok := col.Type.(types.BitType); ok {
+						if v, _, err := bt.Convert(ctx, bytes); err == nil {
+							row[i] = v
+						}
+					}
+				}
+			}
 		case query.Type_GEOMETRY:
 			if row[i] != nil {
 				r, _, err := types.GeometryType{}.Convert(ctx, row[i].([]byte))
@@ -562,9 +572,12 @@ func emptyRowForSchema(sch sql.Schema) ([]any, error) {
 func emptyValuePointerForType(t sql.Type) (any, error) {
 	switch t.Type() {
 	case query.Type_INT8, query.Type_INT16, query.Type_INT24, query.Type_INT64,
-		query.Type_BIT, query.Type_YEAR:
+		query.Type_YEAR:
 		var i gosql.NullInt64
 		return &i, nil
+	case query.Type_BIT:
+		var b []byte
+		return &b, nil
 	case query.Type_INT32:
 		var i gosql.NullInt32
 		return &i, nil
@@ -624,8 +637,10 @@ func schemaForRows(rows *gosql.Rows) (sql.Schema, error) {
 
 func convertGoSqlType(columnType *gosql.ColumnType) (sql.Type, error) {
 	switch strings.ToLower(columnType.DatabaseTypeName()) {
-	case "tinyint", "smallint", "mediumint", "int", "bigint", "bit":
+	case "tinyint", "smallint", "mediumint", "int", "bigint":
 		return types.Int64, nil
+	case "bit":
+		return types.MustCreateBitType(1), nil
 	case "unsigned tinyint", "unsigned smallint", "unsigned mediumint", "unsigned int", "unsigned bigint":
 		return types.Uint64, nil
 	case "float", "double":

sql/types/bit.go

@@ -199,7 +199,16 @@ func (t BitType_) SQL(ctx *sql.Context, dest []byte, v interface{}) (sqltypes.Va
 	}
 	bitVal := value.(uint64)
 
-	return sqltypes.NewUint64(bitVal), nil
+	var data []byte
+	for i := uint64(0); i < uint64(t.numOfBits); i += 8 {
+		data = append(data, byte(bitVal>>i))
+	}
+	for i, j := 0, len(data)-1; i < j; i, j = i+1, j-1 {
+		data[i], data[j] = data[j], data[i]
+	}
+	val := data
+
+	return sqltypes.MakeTrusted(sqltypes.Bit, val), nil
 }
 
 // String implements Type interface.
@@ -209,8 +218,7 @@ func (t BitType_) String() string {
 
 // Type implements Type interface.
 func (t BitType_) Type() query.Type {
-	// Use Uint64 for MySQL driver compatibility
-	return sqltypes.Uint64
+	return sqltypes.Bit
 }
 
 // ValueType implements Type interface.

sql/types/conversion.go

@@ -692,7 +692,18 @@ func GeneralizeTypes(a, b sql.Type) sql.Type {
 		// TODO: match blob length to max of the blob lengths
 		return LongBlob
 	}
-
+	aIsBit := IsBit(a)
+	bIsBit := IsBit(b)
+	if aIsBit && bIsBit {
+		// TODO: match max bits to max of max bits between a and b
+		return a.Promote()
+	}
+	if aIsBit {
+		a = Int64
+	}
+	if bIsBit {
+		b = Int64
+	}
 	aIsYear := IsYear(a)
 	bIsYear := IsYear(b)
 	if aIsYear && bIsYear {