Merge branch 'master' into qiuyesuifeng/update-vendor

jadderbao · May 10, 2016 · e5de4e5 · e5de4e5
2 parents 29ad227 + b32b26a
commit e5de4e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/optimizer/typeinferer.go b/optimizer/typeinferer.go
@@ -258,6 +258,10 @@ func (v *typeInferrer) handleFuncCallExpr(x *ast.FuncCallExpr) {
 	switch x.FnName.L {
 	case "abs", "ifnull", "nullif":
 		tp = x.Args[0].GetType()
+		// TODO: We should cover all types.
+		if x.FnName.L == "abs" && tp.Tp == mysql.TypeDatetime {
+			tp = types.NewFieldType(mysql.TypeDouble)
+		}
 	case "pow", "power", "rand":
 		tp = types.NewFieldType(mysql.TypeDouble)
 	case "curdate", "current_date", "date":

diff --git a/optimizer/typeinferer_test.go b/optimizer/typeinferer_test.go
@@ -82,6 +82,7 @@ func (ts *testTypeInferrerSuite) TestInferType(c *C) {
 		{"count(c1)", mysql.TypeLonglong, charset.CharsetBin},
 		{"abs(1)", mysql.TypeLonglong, charset.CharsetBin},
 		{"abs(1.1)", mysql.TypeNewDecimal, charset.CharsetBin},
+		{"abs(cast(\"20150817015609\" as DATETIME))", mysql.TypeDouble, charset.CharsetBin},
 		{"IF(1>2,2,3)", mysql.TypeLonglong, charset.CharsetBin},
 		{"IFNULL(1,0)", mysql.TypeLonglong, charset.CharsetBin},
 		{"POW(2,2)", mysql.TypeDouble, charset.CharsetBin},