cleanup extra funcs

Author: elianddb

sql/expression/function/time_math.go

@@ -232,7 +232,7 @@ func (d *DateAdd) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	var dateVal interface{}
-	dateVal, _, err = types.DatetimeMaxLimit.Convert(ctx, date)
+	dateVal, _, err = types.DatetimeMaxRange.Convert(ctx, date)
 	if err != nil {
 		ctx.Warn(1292, err.Error())
 		return nil, nil
@@ -380,7 +380,7 @@ func (d *DateSub) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	var dateVal interface{}
-	dateVal, _, err = types.DatetimeMaxPrecision.Convert(ctx, date)
+	dateVal, _, err = types.DatetimeMaxRange.Convert(ctx, date)
 	if err != nil {
 		ctx.Warn(1292, err.Error())
 		return nil, nil

sql/expression/interval.go

@@ -238,24 +238,23 @@ const (
 )
 
 // isLeapYear determines if a given year is a leap year
-// Uses Go's built-in date handling for accuracy
 func isLeapYear(year int) bool {
 	return daysInMonth(year, time.February) == 29
 }
 
 // daysInMonth returns the number of days in a given month/year combination
-// Uses Go's built-in date handling: day 0 of next month = last day of current month
 func daysInMonth(year int, month time.Month) int {
 	return time.Date(year, month+1, 0, 0, 0, 0, 0, time.UTC).Day()
 }
 
+// apply applies the time delta to the given time, using the specified sign
 func (td TimeDelta) apply(t time.Time, sign int64) time.Time {
 	if td.Years != 0 {
 		targetYear := t.Year() + int(td.Years*sign)
 
-		// Special handling for Feb 29 on leap years
+		// special handling for Feb 29 on leap years
 		if t.Month() == time.February && t.Day() == 29 && !isLeapYear(targetYear) {
-			// If we're on Feb 29 and target year is not a leap year,
+			// if we're on Feb 29 and target year is not a leap year,
 			// move to Feb 28
 			t = time.Date(targetYear, time.February, 28,
 				t.Hour(), t.Minute(), t.Second(), t.Nanosecond(), t.Location())
@@ -266,17 +265,17 @@ func (td TimeDelta) apply(t time.Time, sign int64) time.Time {
 	}
 
 	if td.Months != 0 {
-		totalMonths := int(t.Month()) - 1 + int(td.Months*sign) // Convert to 0-based
+		totalMonths := int(t.Month()) - 1 + int(td.Months*sign) // convert to 0-based
 
-		// Calculate target year and month
+		// calculate target year and month
 		yearOffset := totalMonths / 12
 		if totalMonths < 0 {
-			yearOffset = (totalMonths - 11) / 12 // Handle negative division correctly
+			yearOffset = (totalMonths - 11) / 12 // handle negative division correctly
 		}
 		targetYear := t.Year() + yearOffset
-		targetMonth := time.Month((totalMonths%12+12)%12 + 1) // Ensure positive month
+		targetMonth := time.Month((totalMonths%12+12)%12 + 1) // ensure positive month
 
-		// Handle end-of-month edge cases
+		// handle end-of-month edge cases
 		originalDay := t.Day()
 		maxDaysInTargetMonth := daysInMonth(targetYear, targetMonth)
 

sql/rowexec/insert.go

@@ -261,6 +261,7 @@ func getFieldIndexFromUpdateExpr(updateExpr sql.Expression) (int, bool) {
 
 // resolveValues resolves all VALUES functions.
 func (i *insertIter) resolveValues(ctx *sql.Context, insertRow sql.Row) error {
+	// if vals empty then no need to resolve
 	for _, updateExpr := range i.updateExprs {
 		var err error
 		sql.Inspect(updateExpr, func(expr sql.Expression) bool {

sql/types/datetime.go

@@ -17,7 +17,6 @@ package types
 import (
 	"context"
 	"fmt"
-	"math"
 	"reflect"
 	"time"
 
@@ -104,8 +103,8 @@ var (
 	Timestamp = MustCreateDatetimeType(sqltypes.Timestamp, 0)
 	// TimestampMaxPrecision is a UNIX timestamp with maximum precision
 	TimestampMaxPrecision = MustCreateDatetimeType(sqltypes.Timestamp, 6)
-	// DatetimeMaxLimit is a date and a time with maximum precision and maximum range.
-	DatetimeMaxLimit = MustCreateDatetimeType(sqltypes.Datetime, 6)
+	// DatetimeMaxRange is a date and a time with maximum precision and maximum range.
+	DatetimeMaxRange = MustCreateDatetimeType(sqltypes.Datetime, 6)
 
 	datetimeValueType = reflect.TypeOf(time.Time{})
 )
@@ -222,7 +221,7 @@ func ConvertToTime(ctx context.Context, v interface{}, t datetimeType) (time.Tim
 		res = res.Round(time.Microsecond)
 	}
 
-	if t == DatetimeMaxLimit {
+	if t == DatetimeMaxRange {
 		validated := ValidateTime(res)
 		if validated == nil {
 			return time.Time{}, ErrConvertingToTimeOutOfRange.New(v, t)
@@ -237,10 +236,10 @@ func ConvertToTime(ctx context.Context, v interface{}, t datetimeType) (time.Tim
 		}
 	case sqltypes.Datetime:
 		if res.Year() < 0 || res.Year() > 9999 {
-			return time.Time{}, ErrConvertingToTimeOutOfRange.New(res.Format(sql.DatetimeLayoutNoTrim), t.String())
+			return time.Time{}, ErrConvertingToTimeOutOfRange.New(res.Format(sql.TimestampDatetimeLayout), t.String())
 		}
 	case sqltypes.Timestamp:
-		if res.Before(time.Unix(1, 0)) || res.After(time.Unix(math.MaxInt32, 999999000)) {
+		if ValidateTimestamp(res) == nil {
 			return time.Time{}, ErrConvertingToTimeOutOfRange.New(res.Format(sql.TimestampDatetimeLayout), t.String())
 		}
 	}
@@ -506,15 +505,6 @@ func ValidateTime(t time.Time) interface{} {
 	return t
 }
 
-// ValidateDatetime receives a time and returns either that time or nil if it's
-// not a valid datetime.
-func ValidateDatetime(t time.Time) interface{} {
-	if t.Before(datetimeTypeMinDatetime) || t.After(datetimeTypeMaxDatetime) {
-		return nil
-	}
-	return t
-}
-
 // ValidateTimestamp receives a time and returns either that time or nil if it's
 // not a valid timestamp.
 func ValidateTimestamp(t time.Time) interface{} {
@@ -523,12 +513,3 @@ func ValidateTimestamp(t time.Time) interface{} {
 	}
 	return t
 }
-
-// validateDate receives a time and returns either that time or nil if it's
-// not a valid date.
-func ValidateDate(t time.Time) interface{} {
-	if t.Before(datetimeTypeMinDate) || t.After(datetimeTypeMaxDate) {
-		return nil
-	}
-	return t
-}

sql/types/datetime_test.go

@@ -413,17 +413,7 @@ func TestDatetimeOverflowUnderflow(t *testing.T) {
 		val         interface{}
 		expectError bool
 	}{
-		//// Date underflow
-		//{Date, "0999-12-31", true},
-		//// Date overflow
-		//{Date, "10000-01-01", true},
-		//// Datetime underflow
-		//{Datetime, "0999-12-31 23:59:59", true},
-		//// Datetime overflow
-		//{Datetime, "10000-01-01 00:00:00", true},
-		// Timestamp underflow
 		{Timestamp, "1969-12-31 23:59:59", true},
-		// Timestamp overflow
 		{Timestamp, "2038-01-19 03:14:08", true},
 		{Date, Date.MinimumTime().Format("2006-01-02"), false},
 		{Date, Date.MaximumTime().Format("2006-01-02"), false},