more fixing for unix_timestmap

Author: James Cor

enginetest/queries/script_queries.go

@@ -5133,6 +5133,8 @@ CREATE TABLE tab3 (
 		Name:    "UNIX_TIMESTAMP function preserves trailing 0s",
 		SetUpScript: []string{
 			"SET time_zone = '+07:00';",
+			"create table t (d0 datetime(0), d1 datetime(1), d2 datetime(2), d3 datetime(3), d4 datetime(4), d5 datetime(5), d6 datetime(6));",
+			"insert into t values ('2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456', '2020-01-02 12:34:56.123456')",
 		},
 		Assertions: []ScriptTestAssertion{
 			{
@@ -5153,6 +5155,12 @@ CREATE TABLE tab3 (
 					{"981178496.123457"},
 				},
 			},
+			{
+				Query: "select unix_timestamp(d0), unix_timestamp(d1), unix_timestamp(d2), unix_timestamp(d3), unix_timestamp(d4), unix_timestamp(d5), unix_timestamp(d6) from t;",
+				Expected: []sql.Row{
+					{"1577943296", "1577943296.1", "1577943296.12", "1577943296.123", "1577943296.1235", "1577943296.12346", "1577943296.123456"},
+				},
+			},
 		},
 	},
 

sql/expression/convert.go

@@ -17,7 +17,8 @@ package expression
 import (
 	"encoding/hex"
 	"fmt"
-	"strconv"
+	"github.com/dolthub/vitess/go/sqltypes"
+"strconv"
 	"strings"
 	"time"
 
@@ -155,7 +156,7 @@ func (c *Convert) Type() sql.Type {
 	case ConvertToDate:
 		return types.Date
 	case ConvertToDatetime:
-		return types.DatetimeMaxPrecision
+		return types.MustCreateDatetimeType(sqltypes.Datetime, c.typeLength)
 	case ConvertToDecimal:
 		if c.cachedDecimalType == nil {
 			c.cachedDecimalType = createConvertedDecimalType(c.typeLength, c.typeScale, true)

sql/expression/function/date.go

@@ -406,18 +406,18 @@ var _ sql.CollationCoercible = (*UnixTimestamp)(nil)
 const MaxUnixTimeMicroSecs = 32536771199999999
 
 // noEval returns true if the expression contains an expression that cannot be evaluated without sql.Context or sql.Row.
-func noEval(expr sql.Expression) bool {
-	var hasBadExpr bool
+func canEval(expr sql.Expression) bool {
+	// Convert Timezone is not evaluable
+	evaluable := true
 	transform.InspectExpr(expr, func(e sql.Expression) bool {
 		switch e.(type) {
-		case *expression.GetField:
-			hasBadExpr = true
-		case *ConvertTz:
-			hasBadExpr = true
+		case *expression.GetField, *ConvertTz:
+			evaluable = false
+			return true
 		}
-		return hasBadExpr
+		return false
 	})
-	return hasBadExpr
+	return evaluable
 }
 
 func getNowExpr(expr sql.Expression) *Now {
@@ -436,7 +436,7 @@ func evalNowType(now *Now) sql.Type {
 	if now.prec == nil {
 		return types.Int64
 	}
-	if noEval(now.prec) {
+	if !canEval(now.prec) {
 		return types.MustCreateDecimalType(19, 6)
 	}
 	prec, pErr := now.prec.Eval(nil, nil)
@@ -463,7 +463,10 @@ func NewUnixTimestamp(args ...sql.Expression) (sql.Expression, error) {
 	}
 
 	arg := args[0]
-	if noEval(arg) {
+	if dtType, isDtType := arg.Type().(sql.DatetimeType); isDtType {
+		return &UnixTimestamp{Date: arg, typ: types.MustCreateDecimalType(19, uint8(dtType.Precision()))}, nil
+	}
+	if !canEval(arg) {
 		return &UnixTimestamp{Date: arg, typ: types.MustCreateDecimalType(19, 6)}, nil
 	}
 	if now := getNowExpr(arg); now != nil {

sql/types/datetime.go

@@ -350,6 +350,9 @@ func (t datetimeType) MustConvert(v interface{}) interface{} {
 
 // Equals implements the Type interface.
 func (t datetimeType) Equals(otherType sql.Type) bool {
+	if dtType, isDtType := otherType.(sql.DatetimeType); isDtType {
+		return t.baseType == dtType.Type() && t.precision == dtType.Precision()
+	}
 	return t.baseType == otherType.Type()
 }