fmt

pingcap · Mar 10, 2020 · 1f136c7 · 1f136c7
1 parent 6aa6247
commit 1f136c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/executor/insert_common.go b/executor/insert_common.go
@@ -514,9 +514,8 @@ func (e *InsertValues) getColDefaultValue(idx int, col *table.Column) (d types.D
 	if e.colDefaultVals != nil && e.colDefaultVals[idx].valid {
 		if !col.DefaultIsExpr {
 			return e.colDefaultVals[idx].val, nil
-		} else {
-			return table.EvalColDefaultExprNode(e.ctx, col.ToInfo(), e.colDefaultVals[idx].expr)
 		}
+		return table.EvalColDefaultExpr(e.ctx, col.ToInfo(), e.colDefaultVals[idx].expr)
 	}
 	var (
 		defaultVal  types.Datum
@@ -529,7 +528,7 @@ func (e *InsertValues) getColDefaultValue(idx int, col *table.Column) (d types.D
 		if err != nil {
 			return types.Datum{}, err
 		}
-		defaultVal, err = table.EvalColDefaultExprNode(e.ctx, col.ToInfo(), defaultExpr)
+		defaultVal, err = table.EvalColDefaultExpr(e.ctx, col.ToInfo(), defaultExpr)
 	}
 	if err != nil {
 		return types.Datum{}, err

diff --git a/table/column.go b/table/column.go
@@ -392,7 +392,7 @@ func GetColDefaultExpr(col *model.ColumnInfo) (ast.ExprNode, error) {
 }
 
 // EvalColDefaultExpr eval default expr node to explicit default value.
-func EvalColDefaultExprNode(ctx sessionctx.Context, col *model.ColumnInfo, defaultExpr ast.ExprNode) (types.Datum, error) {
+func EvalColDefaultExpr(ctx sessionctx.Context, col *model.ColumnInfo, defaultExpr ast.ExprNode) (types.Datum, error) {
 	d, err := expression.EvalAstExpr(ctx, defaultExpr)
 	if err != nil {
 		return types.Datum{}, err