mysql: fix cast date to int.

yanghang8612 · Apr 2, 2016 · 0b2c9f9 · 0b2c9f9
1 parent 8aa1055
commit 0b2c9f9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/mysql/time.go b/mysql/time.go
@@ -215,17 +215,27 @@ func (t *Time) UnmarshalInLocation(b []byte, loc *time.Location) error {
 }
 
 const numberFormat = "20060102150405"
+const dateFormat = "20060102"
 
 // ToNumber returns a formatted number.
 // e.g,
+// 2012-12-12 -> 20121212
 // 2012-12-12T10:10:10 -> 20121212101010
 // 2012-12-12T10:10:10.123456 -> 20121212101010.123456
 func (t Time) ToNumber() Decimal {
 	if t.IsZero() {
 		return ZeroDecimal
 	}
 
-	tfStr := numberFormat
+	// Fix issue #1046
+	// Prevents from converting 2012-12-12 to 20121212000000
+	var tfStr string
+	if t.Type == TypeDate {
+		tfStr = dateFormat
+	} else {
+		tfStr = numberFormat
+	}
+
 	if t.Fsp > 0 {
 		tfStr = fmt.Sprintf("%s.%s", tfStr, strings.Repeat("0", t.Fsp))
 	}

diff --git a/mysql/time_test.go b/mysql/time_test.go
@@ -474,6 +474,29 @@ func (s *testTimeSuite) TestToNumber(c *C) {
 		c.Assert(t.ToNumber().String(), Equals, test.Expect)
 	}
 
+	// Fix issue #1046
+	tblDate := []struct {
+		Input  string
+		Fsp    int
+		Expect string
+	}{
+		{"12-12-31 11:30:45", 0, "20121231"},
+		{"12-12-31 11:30:45", 6, "20121231"},
+		{"12-12-31 11:30:45.123", 6, "20121231"},
+		{"12-12-31 11:30:45.123345", 0, "20121231"},
+		{"12-12-31 11:30:45.123345", 3, "20121231"},
+		{"12-12-31 11:30:45.123345", 5, "20121231"},
+		{"12-12-31 11:30:45.123345", 6, "20121231"},
+		{"12-12-31 11:30:45.1233457", 6, "20121231"},
+		{"12-12-31 11:30:45.823345", 0, "20121231"},
+	}
+
+	for _, test := range tblDate {
+		t, err := ParseTime(test.Input, TypeDate, 0)
+		c.Assert(err, IsNil)
+		c.Assert(t.ToNumber().String(), Equals, test.Expect)
+	}
+
 	tblDuration := []struct {
 		Input  string
 		Fsp    int