fix extract functions

Author: angelamayxie

enginetest/queries/function_queries.go

@@ -2127,6 +2127,22 @@ var FunctionQueryTests = []QueryTest{
 		ExpectedWarning:       mysql.ERTruncatedWrongValue,
 		ExpectedWarningsCount: 1,
 	},
+	{
+		Query: "select extract(week from 0)",
+		// This is 613566757 in MySQL but that value seems related to this bug https://bugs.mysql.com/bug.php?id=71414&files=1
+		Expected: []sql.Row{{1}},
+	},
+	{
+		Query: "select extract(week from false)",
+		// This is 613566757 in MySQL but that value seems related to this bug https://bugs.mysql.com/bug.php?id=71414&files=1
+		Expected: []sql.Row{{1}},
+	},
+	{
+		Query:                 "select extract(week from true)",
+		Expected:              []sql.Row{{nil}},
+		ExpectedWarning:       mysql.ERTruncatedWrongValue,
+		ExpectedWarningsCount: 1,
+	},
 	{
 		Query:    "select extract(month from 0)",
 		Expected: []sql.Row{{0}},

sql/expression/function/extract.go

@@ -114,7 +114,7 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 	switch unit {
 	case "DAY":
-		return dateTime.Day(), nil
+		return day(dateTime), nil
 	case "HOUR":
 		return dateTime.Hour(), nil
 	case "MINUTE":
@@ -124,27 +124,19 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	case "MICROSECOND":
 		return dateTime.Nanosecond() / 1000, nil
 	case "QUARTER":
-		return (int(dateTime.Month())-1)/3 + 1, nil
+		return quarter(dateTime), nil
 	case "MONTH":
-		return int(dateTime.Month()), nil
+		return month(dateTime), nil
 	case "WEEK":
-		dateVal, err := td.RightChild.Eval(ctx, row)
-		if err != nil {
-			return nil, err
-		}
-		date, err := getDate(ctx, dateVal)
-		if err != nil {
-			return nil, err
-		}
-		yyyy, ok := year(date).(int)
+		yyyy, ok := year(dateTime).(int)
 		if !ok {
 			return nil, sql.ErrInvalidArgumentDetails.New("WEEK", "invalid year")
 		}
-		mm, ok := month(date).(int)
+		mm, ok := month(dateTime).(int)
 		if !ok {
 			return nil, sql.ErrInvalidArgumentDetails.New("WEEK", "invalid month")
 		}
-		dd, ok := day(date).(int)
+		dd, ok := day(dateTime).(int)
 		if !ok {
 			return nil, sql.ErrInvalidArgumentDetails.New("WEEK", "invalid day")
 		}
@@ -157,29 +149,41 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		}
 		return int(week), nil
 	case "YEAR":
-		return dateTime.Year(), nil
+		return year(dateTime), nil
 	case "DAY_HOUR":
-		dd := dateTime.Day() * 1_00
+		dd, ok := day(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("DAY_HOUR", "invalid day")
+		}
 		hh := dateTime.Hour()
-		return dd + hh, nil
+		return (dd * 1_00) + hh, nil
 	case "DAY_MINUTE":
-		dd := dateTime.Day() * 1_00_00
+		dd, ok := day(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("DAY_MINUTE", "invalid day")
+		}
 		hh := dateTime.Hour() * 1_00
 		mm := dateTime.Minute()
-		return dd + hh + mm, nil
+		return (dd * 1_00_00) + hh + mm, nil
 	case "DAY_SECOND":
-		dd := dateTime.Day() * 1_00_00_00
+		dd, ok := day(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("DAY_SECOND", "invalid day")
+		}
 		hh := dateTime.Hour() * 1_00_00
 		mm := dateTime.Minute() * 1_00
 		ss := dateTime.Second()
-		return dd + hh + mm + ss, nil
+		return (dd * 1_00_00_00) + hh + mm + ss, nil
 	case "DAY_MICROSECOND":
-		dd := dateTime.Day() * 1_00_00_00_000000
+		dd, ok := day(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("DAY_MICROSECOND", "invalid day")
+		}
 		hh := dateTime.Hour() * 1_00_00_000000
 		mm := dateTime.Minute() * 1_00_000000
 		ss := dateTime.Second() * 1_000000
 		mmmmmm := dateTime.Nanosecond() / 1000
-		return dd + hh + mm + ss + mmmmmm, nil
+		return (dd * 1_00_00_00_000000) + hh + mm + ss + mmmmmm, nil
 	case "HOUR_MINUTE":
 		hh := dateTime.Hour() * 1_00
 		mm := dateTime.Minute()
@@ -209,10 +213,15 @@ func (td *Extract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		mmmmmm := dateTime.Nanosecond() / 1000
 		return ss + mmmmmm, nil
 	case "YEAR_MONTH":
-		yyyy := dateTime.Year() * 1_00
-		dateTime.Month()
-		mm := int(dateTime.Month())
-		return yyyy + mm, nil
+		yyyy, ok := year(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("YEAR_MONTH", "invalid year")
+		}
+		mm, ok := month(dateTime).(int)
+		if !ok {
+			return nil, sql.ErrInvalidArgumentDetails.New("YEAR_MONTH", "invalid month")
+		}
+		return (yyyy * 1_00) + mm, nil
 	default:
 		return nil, fmt.Errorf("invalid time unit")
 	}