more stuff

Author: James Cor

sql/expression/comparison.go

@@ -207,6 +207,12 @@ func (c *comparison) IsValueExpression() bool {
 	if !ok {
 		return false
 	}
+	if _, ok := c.LeftChild.Type().(sql.ValueType); !ok {
+		return false
+	}
+	if _, ok := c.RightChild.Type().(sql.ValueType); !ok {
+		return false
+	}
 	return l.IsValueExpression() && r.IsValueExpression()
 }
 

sql/expression/literal.go

@@ -141,7 +141,7 @@ func (lit *Literal) EvalValue(ctx *sql.Context, row sql.ValueRow) (sql.Value, er
 	return lit.val2, nil
 }
 
-// IsValueRowIter implements the ValueExpression interface.
+// IsValueExpression implements the ValueExpression interface.
 func (lit *Literal) IsValueExpression() bool {
 	return types.IsInteger(lit.Typ)
 }

sql/types/datetime.go

@@ -701,6 +701,6 @@ func ConvertValueToDatetime(ctx *sql.Context, v sql.Value) (time.Time, error) {
 		}
 		return res, err
 	default:
-		return zeroTime, sql.ErrInvalidBaseType.New(v.Typ.String(), "number")
+		return zeroTime, sql.ErrInvalidBaseType.New(v.Typ.String(), "datetime")
 	}
 }

sql/types/decimal.go

@@ -411,7 +411,6 @@ func (t DecimalType_) DecimalValueStringFixed(v decimal.Decimal) string {
 	}
 }
 
-// TODO: Should this take in precision and scale?
 func ConvertValueToDecimal(ctx *sql.Context, v sql.Value) (decimal.Decimal, error) {
 	switch v.Typ {
 	case sqltypes.Int8: