*: add_date can return mysql.Time

expression/builtin_time.go

@@ -2681,6 +2681,18 @@ func (du *baseDateArithmitical) add(ctx sessionctx.Context, date types.Time, int
 	return date, false, nil
 }
 
+func (du baseDateArithmitical) addDuration(ctx sessionctx.Context, d types.Duration, interval string, unit string) (types.Duration, bool, error) {
+	dur, err := types.ExtractDurationValue(unit, interval)
+	if err != nil {
+		return types.ZeroDuration, true, handleInvalidTimeError(ctx, err)
+	}
+	retDur, err := d.Add(dur)
+	if err != nil {
+		return types.ZeroDuration, true, err
+	}
+	return retDur, false, nil
+}
+
 func (du *baseDateArithmitical) sub(ctx sessionctx.Context, date types.Time, interval string, unit string) (types.Time, bool, error) {
 	year, month, day, dur, err := types.ExtractTimeValue(unit, interval)
 	if err != nil {
@@ -2717,7 +2729,7 @@ func (c *addDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
 	}
 
 	dateEvalTp := args[0].GetType().EvalType()
-	if dateEvalTp != types.ETString && dateEvalTp != types.ETInt {
+	if dateEvalTp != types.ETString && dateEvalTp != types.ETInt && dateEvalTp != types.ETDuration {
 		dateEvalTp = types.ETDatetime
 	}
 
@@ -2727,8 +2739,32 @@ func (c *addDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
 	}
 
 	argTps := []types.EvalType{dateEvalTp, intervalEvalTp, types.ETString}
-	bf := newBaseBuiltinFuncWithTp(ctx, args, types.ETDatetime, argTps...)
-	bf.tp.Flen, bf.tp.Decimal = mysql.MaxDatetimeFullWidth, types.UnspecifiedLength
+	var bf baseBuiltinFunc
+	if dateEvalTp == types.ETDuration {
+		unit, _, err := args[2].EvalString(ctx, chunk.Row{})
+		if err != nil {
+			return nil, err
+		}
+		internalFsp := 0
+		switch unit {
+		case "MICROSECOND", "SECOND_MICROSECOND", "MINUTE_MICROSECOND", "HOUR_MICROSECOND", "DAY_MICROSECOND":
+			internalFsp = types.MaxFsp
+		case "SECOND":
+			internalFsp = types.MaxFsp
+			if intervalEvalTp != types.ETString {
+				internalFsp = mathutil.Min(args[1].GetType().Decimal, types.MaxFsp)
+			}
+		}
+		bf = newBaseBuiltinFuncWithTp(ctx, args, types.ETDuration, argTps...)
+		arg0Dec, err := getExpressionFsp(ctx, args[0])
+		if err != nil {
+			return nil, err
+		}
+		bf.tp.Flen, bf.tp.Decimal = mysql.MaxDurationWidthWithFsp, mathutil.Max(arg0Dec, internalFsp)
+	} else {
+		bf = newBaseBuiltinFuncWithTp(ctx, args, types.ETDatetime, argTps...)
+		bf.tp.Flen, bf.tp.Decimal = mysql.MaxDatetimeFullWidth, types.UnspecifiedLength
+	}
 
 	switch {
 	case dateEvalTp == types.ETString && intervalEvalTp == types.ETString:
@@ -2776,6 +2812,21 @@ func (c *addDateFunctionClass) getFunction(ctx sessionctx.Context, args []Expres
 			baseBuiltinFunc:      bf,
 			baseDateArithmitical: newDateArighmeticalUtil(),
 		}
+	case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETString:
+		sig = &builtinAddDateDurationStringSig{
+			baseBuiltinFunc:      bf,
+			baseDateArithmitical: newDateArighmeticalUtil(),
+		}
+	case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETInt:
+		sig = &builtinAddDateDurationIntSig{
+			baseBuiltinFunc:      bf,
+			baseDateArithmitical: newDateArighmeticalUtil(),
+		}
+	case dateEvalTp == types.ETDuration && intervalEvalTp == types.ETDecimal:
+		sig = &builtinAddDateDurationDecimalSig{
+			baseBuiltinFunc:      bf,
+			baseDateArithmitical: newDateArighmeticalUtil(),
+		}
 	}
 	return sig, nil
 }
@@ -3077,6 +3128,79 @@ func (b *builtinAddDateDatetimeDecimalSig) evalTime(row chunk.Row) (types.Time,
 	return result, isNull || err != nil, err
 }
 
+type builtinAddDateDurationStringSig struct {
+	baseBuiltinFunc
+	baseDateArithmitical
+}
+
+func (b *builtinAddDateDurationStringSig) evalDuration(row chunk.Row) (types.Duration, bool, error) {
+	unit, isNull, err := b.args[2].EvalString(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	dur, isNull, err := b.args[0].EvalDuration(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	interval, isNull, err := b.getIntervalFromString(b.ctx, b.args, row, unit)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	result, isNull, err := b.addDuration(b.ctx, dur, interval, unit)
+	return result, isNull || err != nil, err
+}
+
+type builtinAddDateDurationIntSig struct {
+	baseBuiltinFunc
+	baseDateArithmitical
+}
+
+func (b *builtinAddDateDurationIntSig) evalDuration(row chunk.Row) (types.Duration, bool, error) {
+	unit, isNull, err := b.args[2].EvalString(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	dur, isNull, err := b.args[0].EvalDuration(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+	interval, isNull, err := b.getIntervalFromInt(b.ctx, b.args, row, unit)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	result, isNull, err := b.addDuration(b.ctx, dur, interval, unit)
+	return result, isNull || err != nil, err
+}
+
+type builtinAddDateDurationDecimalSig struct {
+	baseBuiltinFunc
+	baseDateArithmitical
+}
+
+func (b *builtinAddDateDurationDecimalSig) evalDuration(row chunk.Row) (types.Duration, bool, error) {
+	unit, isNull, err := b.args[2].EvalString(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	dur, isNull, err := b.args[0].EvalDuration(b.ctx, row)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+	interval, isNull, err := b.getIntervalFromDecimal(b.ctx, b.args, row, unit)
+	if isNull || err != nil {
+		return types.ZeroDuration, true, err
+	}
+
+	result, isNull, err := b.addDuration(b.ctx, dur, interval, unit)
+	return result, isNull || err != nil, err
+}
+
 type subDateFunctionClass struct {
 	baseFunctionClass
 }

expression/builtin_time_test.go

@@ -1761,6 +1761,33 @@ func (s *testEvaluatorSuite) TestDateArithFuncs(c *C) {
 		c.Assert(err, IsNil)
 		c.Assert(v.GetMysqlTime().String(), Equals, test.expected)
 	}
+	testDurations := []struct {
+		dur      string
+		fsp      int
+		unit     string
+		format   interface{}
+		expected string
+	}{
+		{
+			dur:      "00:00:00",
+			fsp:      0,
+			unit:     "MICROSECOND",
+			format:   "100",
+			expected: "00:00:00.000100",
+		},
+	}
+	for _, tt := range testDurations {
+		dur, _, ok, err := types.StrToDuration(nil, tt.dur, tt.fsp)
+		c.Assert(err, IsNil)
+		c.Assert(ok, IsTrue)
+		args = types.MakeDatums(dur, tt.format, tt.unit)
+		f, err = fcAdd.getFunction(s.ctx, s.datumsToConstants(args))
+		c.Assert(err, IsNil)
+		c.Assert(f, NotNil)
+		v, err = evalBuiltinFunc(f, chunk.Row{})
+		c.Assert(err, IsNil)
+		c.Assert(v.GetMysqlDuration().String(), Equals, tt.expected)
+	}
 }
 
 func (s *testEvaluatorSuite) TestTimestamp(c *C) {

types/const_test.go

@@ -16,7 +16,6 @@ package types_test
 import (
 	"context"
 	"flag"
-	"testing"
 
 	. "github.com/pingcap/check"
 	"github.com/pingcap/parser"
@@ -30,11 +29,6 @@ import (
 	"github.com/pingcap/tidb/util/testleak"
 )
 
-func TestT(t *testing.T) {
-	CustomVerboseFlag = true
-	TestingT(t)
-}
-
 var _ = Suite(&testMySQLConstSuite{})
 
 type testMySQLConstSuite struct {

types/errors.go

@@ -58,29 +58,31 @@ var (
 	// See https://dev.mysql.com/doc/refman/5.5/en/out-of-range-and-overflow.html for details
 	ErrWarnDataOutOfRange = terror.ClassTypes.New(codeDataOutOfRange, mysql.MySQLErrName[mysql.ErrWarnDataOutOfRange])
 	// ErrDuplicatedValueInType is returned when enum column has duplicated value.
-	ErrDuplicatedValueInType = terror.ClassTypes.New(codeDuplicatedValueInType, mysql.MySQLErrName[mysql.ErrDuplicatedValueInType])
+	ErrDuplicatedValueInType    = terror.ClassTypes.New(codeDuplicatedValueInType, mysql.MySQLErrName[mysql.ErrDuplicatedValueInType])
+	ErrDatetimeFunctionOverflow = terror.ClassTypes.New(codeDatetimeFunctionOverflow, mysql.MySQLErrName[mysql.ErrDatetimeFunctionOverflow])
 )
 
 const (
 	codeBadNumber terror.ErrCode = 1
 
-	codeDataTooLong           = terror.ErrCode(mysql.ErrDataTooLong)
-	codeIllegalValueForType   = terror.ErrCode(mysql.ErrIllegalValueForType)
-	codeTruncated             = terror.ErrCode(mysql.WarnDataTruncated)
-	codeOverflow              = terror.ErrCode(mysql.ErrDataOutOfRange)
-	codeDivByZero             = terror.ErrCode(mysql.ErrDivisionByZero)
-	codeTooBigDisplayWidth    = terror.ErrCode(mysql.ErrTooBigDisplaywidth)
-	codeTooBigFieldLength     = terror.ErrCode(mysql.ErrTooBigFieldlength)
-	codeTooBigSet             = terror.ErrCode(mysql.ErrTooBigSet)
-	codeTooBigScale           = terror.ErrCode(mysql.ErrTooBigScale)
-	codeTooBigPrecision       = terror.ErrCode(mysql.ErrTooBigPrecision)
-	codeWrongFieldSpec        = terror.ErrCode(mysql.ErrWrongFieldSpec)
-	codeTruncatedWrongValue   = terror.ErrCode(mysql.ErrTruncatedWrongValue)
-	codeUnknown               = terror.ErrCode(mysql.ErrUnknown)
-	codeInvalidDefault        = terror.ErrCode(mysql.ErrInvalidDefault)
-	codeMBiggerThanD          = terror.ErrCode(mysql.ErrMBiggerThanD)
-	codeDataOutOfRange        = terror.ErrCode(mysql.ErrWarnDataOutOfRange)
-	codeDuplicatedValueInType = terror.ErrCode(mysql.ErrDuplicatedValueInType)
+	codeDataTooLong              = terror.ErrCode(mysql.ErrDataTooLong)
+	codeIllegalValueForType      = terror.ErrCode(mysql.ErrIllegalValueForType)
+	codeTruncated                = terror.ErrCode(mysql.WarnDataTruncated)
+	codeOverflow                 = terror.ErrCode(mysql.ErrDataOutOfRange)
+	codeDivByZero                = terror.ErrCode(mysql.ErrDivisionByZero)
+	codeTooBigDisplayWidth       = terror.ErrCode(mysql.ErrTooBigDisplaywidth)
+	codeTooBigFieldLength        = terror.ErrCode(mysql.ErrTooBigFieldlength)
+	codeTooBigSet                = terror.ErrCode(mysql.ErrTooBigSet)
+	codeTooBigScale              = terror.ErrCode(mysql.ErrTooBigScale)
+	codeTooBigPrecision          = terror.ErrCode(mysql.ErrTooBigPrecision)
+	codeWrongFieldSpec           = terror.ErrCode(mysql.ErrWrongFieldSpec)
+	codeTruncatedWrongValue      = terror.ErrCode(mysql.ErrTruncatedWrongValue)
+	codeUnknown                  = terror.ErrCode(mysql.ErrUnknown)
+	codeInvalidDefault           = terror.ErrCode(mysql.ErrInvalidDefault)
+	codeMBiggerThanD             = terror.ErrCode(mysql.ErrMBiggerThanD)
+	codeDataOutOfRange           = terror.ErrCode(mysql.ErrWarnDataOutOfRange)
+	codeDuplicatedValueInType    = terror.ErrCode(mysql.ErrDuplicatedValueInType)
+	codeDatetimeFunctionOverflow = terror.ErrCode(mysql.ErrDatetimeFunctionOverflow)
 )
 
 var (
@@ -92,23 +94,24 @@ var (
 
 func init() {
 	typesMySQLErrCodes := map[terror.ErrCode]uint16{
-		codeDataTooLong:           mysql.ErrDataTooLong,
-		codeIllegalValueForType:   mysql.ErrIllegalValueForType,
-		codeTruncated:             mysql.WarnDataTruncated,
-		codeOverflow:              mysql.ErrDataOutOfRange,
-		codeDivByZero:             mysql.ErrDivisionByZero,
-		codeTooBigDisplayWidth:    mysql.ErrTooBigDisplaywidth,
-		codeTooBigFieldLength:     mysql.ErrTooBigFieldlength,
-		codeTooBigSet:             mysql.ErrTooBigSet,
-		codeTooBigScale:           mysql.ErrTooBigScale,
-		codeTooBigPrecision:       mysql.ErrTooBigPrecision,
-		codeWrongFieldSpec:        mysql.ErrWrongFieldSpec,
-		codeTruncatedWrongValue:   mysql.ErrTruncatedWrongValue,
-		codeUnknown:               mysql.ErrUnknown,
-		codeInvalidDefault:        mysql.ErrInvalidDefault,
-		codeMBiggerThanD:          mysql.ErrMBiggerThanD,
-		codeDataOutOfRange:        mysql.ErrWarnDataOutOfRange,
-		codeDuplicatedValueInType: mysql.ErrDuplicatedValueInType,
+		codeDataTooLong:              mysql.ErrDataTooLong,
+		codeIllegalValueForType:      mysql.ErrIllegalValueForType,
+		codeTruncated:                mysql.WarnDataTruncated,
+		codeOverflow:                 mysql.ErrDataOutOfRange,
+		codeDivByZero:                mysql.ErrDivisionByZero,
+		codeTooBigDisplayWidth:       mysql.ErrTooBigDisplaywidth,
+		codeTooBigFieldLength:        mysql.ErrTooBigFieldlength,
+		codeTooBigSet:                mysql.ErrTooBigSet,
+		codeTooBigScale:              mysql.ErrTooBigScale,
+		codeTooBigPrecision:          mysql.ErrTooBigPrecision,
+		codeWrongFieldSpec:           mysql.ErrWrongFieldSpec,
+		codeTruncatedWrongValue:      mysql.ErrTruncatedWrongValue,
+		codeUnknown:                  mysql.ErrUnknown,
+		codeInvalidDefault:           mysql.ErrInvalidDefault,
+		codeMBiggerThanD:             mysql.ErrMBiggerThanD,
+		codeDataOutOfRange:           mysql.ErrWarnDataOutOfRange,
+		codeDuplicatedValueInType:    mysql.ErrDuplicatedValueInType,
+		codeDatetimeFunctionOverflow: mysql.ErrDatetimeFunctionOverflow,
 	}
 	terror.ErrClassToMySQLCodes[terror.ClassTypes] = typesMySQLErrCodes
 }

types/fsp_test.go

@@ -15,15 +15,10 @@ package types
 
 import (
 	"strconv"
-	"testing"
 
 	. "github.com/pingcap/check"
 )
 
-func Test(t *testing.T) {
-	TestingT(t)
-}
-
 var _ = Suite(&FspTest{})
 
 type FspTest struct{}