fix more queries

Author: James Cor

enginetest/queries/function_queries.go

@@ -1052,7 +1052,7 @@ var FunctionQueryTests = []QueryTest{
 	{
 		Query: `SELECT FLOOR(15728640/1024/1030)`,
 		Expected: []sql.Row{
-			{"14"},
+			{14},
 		},
 	},
 	{

enginetest/queries/queries.go

@@ -1603,8 +1603,8 @@ SELECT * FROM cte WHERE  d = 2;`,
 	{
 		Query: `SELECT column_0 FROM (values row(1+1,2+2), row(floor(1.5),concat("a","b"))) a order by 1`,
 		Expected: []sql.Row{
-			{1.0},
-			{2.0},
+			{1},
+			{2},
 		},
 	},
 	{
@@ -1882,8 +1882,8 @@ SELECT * FROM cte WHERE  d = 2;`,
 			join (values row(2,4), row(1.0,"ab")) b on a.column_0 = b.column_0 and a.column_0 = b.column_0
 			order by 1`,
 		Expected: []sql.Row{
-			{1.0, "ab"},
-			{2.0, "4"},
+			{1, "ab"},
+			{2, "4"},
 		},
 	},
 	{
@@ -5509,11 +5509,11 @@ SELECT * FROM cte WHERE  d = 2;`,
 	},
 	{
 		Query:    "select ceil(i + 0.5) from mytable order by 1",
-		Expected: []sql.Row{{"2"}, {"3"}, {"4"}},
+		Expected: []sql.Row{{2}, {3}, {4}},
 	},
 	{
 		Query:    "select floor(i + 0.5) from mytable order by 1",
-		Expected: []sql.Row{{"1"}, {"2"}, {"3"}},
+		Expected: []sql.Row{{1}, {2}, {3}},
 	},
 	{
 		Query:    "select round(i + 0.55, 1) from mytable order by 1",

sql/expression/function/ceil_round_floor.go

@@ -179,18 +179,18 @@ func (f *Floor) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			ctx.Warn(mysql.ERTruncatedWrongValue, "%s", err.Error())
 		}
 	}
-	// if it's number type and not float value, it does not need floor-ing
+
+	// if it's number type and not float value, it does not need ceil-ing
 	switch num := child.(type) {
 	case float32:
-		return math.Floor(float64(num)), nil
+		child = math.Floor(float64(num))
 	case float64:
-		return math.Floor(num), nil
+		child = math.Floor(num)
 	case decimal.Decimal:
-		return num.Floor(), nil
-	default:
-		num, _, _ = f.Type().Convert(ctx, child)
-		return num, nil
+		child = num.Floor()
 	}
+	child, _, _ = f.Type().Convert(ctx, child)
+	return child, nil
 }
 
 // Round returns the number (x) with (d) requested decimal places.