expression: handle duration type infer in least and greatest

expression/builtin_compare.go

@@ -407,12 +407,15 @@ func resolveType4Extremum(args []Expression) types.EvalType {
 	if aggType.EvalType().IsStringKind() {
 		for i := range args {
 			item := args[i].GetType()
-			if types.IsTemporalWithDate(item.Tp) {
-				temporalItem = item
+			// Find the temporal value in the arguments but prefer DateTime value.
+			if types.IsTemporal(item.Tp) {
+				if temporalItem == nil || temporalItem.Tp == mysql.TypeDatetime {
+					temporalItem = item
+				}
 			}
 		}
 
-		if !types.IsTemporalWithDate(aggType.Tp) && temporalItem != nil {
+		if !types.IsTemporal(aggType.Tp) && temporalItem != nil {
 			aggType.Tp = temporalItem.Tp
 		}
 		// TODO: String charset, collation checking are needed.
@@ -444,6 +447,8 @@ func (c *greatestFunctionClass) getFunction(ctx sessionctx.Context, args []Expre
 	if tp == types.ETDatetime || tp == types.ETTimestamp {
 		cmpAsDatetime = true
 		tp = types.ETString
+	} else if tp == types.ETDuration {
+		tp = types.ETString
 	} else if tp == types.ETJson {
 		unsupportedJSONComparison(ctx, args)
 		tp = types.ETString
@@ -469,7 +474,7 @@ func (c *greatestFunctionClass) getFunction(ctx sessionctx.Context, args []Expre
 	case types.ETDecimal:
 		sig = &builtinGreatestDecimalSig{bf}
 		sig.setPbCode(tipb.ScalarFuncSig_GreatestDecimal)
-	case types.ETString:
+	case types.ETString, types.ETDuration:
 		sig = &builtinGreatestStringSig{bf}
 		sig.setPbCode(tipb.ScalarFuncSig_GreatestString)
 	case types.ETDatetime, types.ETTimestamp:
@@ -656,9 +661,11 @@ func (c *leastFunctionClass) getFunction(ctx sessionctx.Context, args []Expressi
 	}
 	tp := resolveType4Extremum(args)
 	cmpAsDatetime := false
-	if tp == types.ETDatetime {
+	if tp == types.ETDatetime || tp == types.ETTimestamp {
 		cmpAsDatetime = true
 		tp = types.ETString
+	} else if tp == types.ETDuration {
+		tp = types.ETString
 	} else if tp == types.ETJson {
 		unsupportedJSONComparison(ctx, args)
 		tp = types.ETString
@@ -684,10 +691,10 @@ func (c *leastFunctionClass) getFunction(ctx sessionctx.Context, args []Expressi
 	case types.ETDecimal:
 		sig = &builtinLeastDecimalSig{bf}
 		sig.setPbCode(tipb.ScalarFuncSig_LeastDecimal)
-	case types.ETString:
+	case types.ETString, types.ETDuration:
 		sig = &builtinLeastStringSig{bf}
 		sig.setPbCode(tipb.ScalarFuncSig_LeastString)
-	case types.ETDatetime:
+	case types.ETDatetime, types.ETTimestamp:
 		sig = &builtinLeastTimeSig{bf}
 		sig.setPbCode(tipb.ScalarFuncSig_LeastTime)
 	}

expression/builtin_compare_test.go

@@ -310,6 +310,10 @@ func (s *testEvaluatorSuite) TestGreatestLeastFunc(c *C) {
 			[]interface{}{duration, "123"},
 			"12:59:59", "123", false, false,
 		},
+		{
+			[]interface{}{duration, duration},
+			"12:59:59", "12:59:59", false, false,
+		},
 		{
 			[]interface{}{"123", nil, "123"},
 			nil, nil, true, false,

types/etc.go

@@ -89,6 +89,12 @@ func IsTemporalWithDate(tp byte) bool {
 	return IsTypeTime(tp)
 }
 
+// IsTemporal returns  a boolean indicating
+// if the tp is time type.
+func IsTemporal(tp byte) bool {
+	return tp == mysql.TypeDatetime || tp == mysql.TypeDate || tp == mysql.TypeTimestamp || tp == mysql.TypeDuration || tp == mysql.TypeNewDate
+}
+
 // IsBinaryStr returns a boolean indicating
 // whether the field type is a binary string type.
 func IsBinaryStr(ft *FieldType) bool {