fixing tests

Author: James Cor

enginetest/queries/type_wire_queries.go

@@ -685,8 +685,8 @@ var TypeWireTests = []TypeWireTest{
 		SetUpScript: []string{
 			`CREATE TABLE test (pk SET("a","b","c") PRIMARY KEY, v1 SET("w","x","y","z"));`,
 			`INSERT INTO test VALUES (0, 1), ("b", "y"), ("b,c", "z,z"), ("a,c,b", 10);`,
-			`UPDATE test SET v1 = "y,x,w" WHERE pk >= 4`,
-			`DELETE FROM test WHERE pk > "b,c";`,
+			`UPDATE test SET v1 = "y,x,w" WHERE pk >= 4;`,
+			`DELETE FROM test WHERE pk = "a,b,c";`,
 		},
 		Queries: []string{
 			`SELECT * FROM test ORDER BY pk;`,

sql/expression/in_test.go

@@ -178,7 +178,6 @@ func TestInTuple(t *testing.T) {
 				expression.NewLiteral("hi", types.TinyText),
 				expression.NewLiteral("bye", types.TinyText),
 			),
-			err:    types.ErrConvertingToTime,
 			row:    nil,
 			result: false,
 		}}

sql/types/datetime.go

@@ -186,6 +186,7 @@ func (t datetimeType) Convert(ctx context.Context, v interface{}) (interface{},
 	if v == nil {
 		return nil, sql.InRange, nil
 	}
+	// TODO: implement datetime truncation
 	res, err := ConvertToTime(ctx, v, t)
 	if err != nil {
 		return nil, sql.OutOfRange, err

sql/types/decimal_test.go

@@ -317,8 +317,8 @@ func TestDecimalConvert(t *testing.T) {
 		{5, 0, "7742", "7742", false},
 		{5, 0, new(big.Float).SetFloat64(-4723.875), "-4724", false},
 		{5, 0, 99999, "99999", false},
-		{5, 0, "0xf8e1", "0", false},
-		{5, 0, "0b1001110101100110", "0", false},
+		{5, 0, "0xf8e1", "0", true},
+		{5, 0, "0b1001110101100110", "0", true},
 		{5, 0, new(big.Rat).SetFrac64(999999, 10), "", true},
 		{5, 0, 673927, "", true},