fix invalid YEAR string is not compatible with Mysql (#10493)

pingcap · May 17, 2019 · 6a4e14c · 6a4e14c
1 parent 08c4559
commit 6a4e14c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/executor/insert_test.go b/executor/insert_test.go
@@ -172,7 +172,7 @@ func (s *testSuite) TestInsertZeroYear(c *C) {
 	tk.MustQuery(`select * from t1;`).Check(testkit.Rows(
 		`0`,
 		`0`,
-		`2000`,
+		`0`,
 		`2000`,
 	))
 }

diff --git a/types/convert_test.go b/types/convert_test.go
@@ -619,6 +619,9 @@ func (s *testTypeConvertSuite) TestConvert(c *C) {
 	signedDeny(c, mysql.TypeYear, 123, "<nil>")
 	signedDeny(c, mysql.TypeYear, 3000, "<nil>")
 	signedAccept(c, mysql.TypeYear, "2000", "2000")
+	signedAccept(c, mysql.TypeYear, "abc", "0")
+	signedAccept(c, mysql.TypeYear, "00abc", "2000")
+	signedAccept(c, mysql.TypeYear, "0019", "2019")
 
 	// time from string
 	signedAccept(c, mysql.TypeDate, "2012-08-23", "2012-08-23")

diff --git a/types/datum.go b/types/datum.go
@@ -1172,11 +1172,14 @@ func (d *Datum) convertToMysqlYear(sc *stmtctx.StatementContext, target *FieldTy
 	)
 	switch d.k {
 	case KindString, KindBytes:
-		y, err = StrToInt(sc, d.GetString())
+		s := d.GetString()
+		y, err = StrToInt(sc, s)
 		if err != nil {
 			return ret, errors.Trace(err)
 		}
-		fromStr = true
+		if len(s) != 4 && len(s) > 0 && s[0:1] == "0" {
+			fromStr = true
+		}
 	case KindMysqlTime:
 		y = int64(d.GetMysqlTime().Time.Year())
 	case KindMysqlDuration:
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,7 +172,7 @@ func (s *testSuite) TestInsertZeroYear(c *C) { @@
     	tk.MustQuery(`select * from t1;`).Check(testkit.Rows(
     		`0`,
     		`0`,
-    		`2000`,
+    		`0`,
     		`2000`,
     	))
     }
@@ Expand Down @@