*: fix microseconds behaviour in DATE_ADD() (#11280) (#11288)

pingcap · Jul 18, 2019 · b9b6c97 · b9b6c97
1 parent 6baed7d
commit b9b6c97
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/expression/integration_test.go b/expression/integration_test.go
@@ -4391,3 +4391,15 @@ func (s *testIntegrationSuite) TestIssue10675(c *C) {
 		testkit.Rows("1"))
 	tk.MustQuery(`select * from t where a > 184467440737095516167.1;`).Check(testkit.Rows())
 }
+
+func (s *testIntegrationSuite) TestIssue11257(c *C) {
+	tk := testkit.NewTestKit(c, s.store)
+	tk.MustQuery(`select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2 SECOND_MICROSECOND);`).Check(
+		testkit.Rows("2007-03-28 22:08:27.800000"))
+	tk.MustQuery(`select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2 MINUTE_MICROSECOND);`).Check(
+		testkit.Rows("2007-03-28 22:08:27.800000"))
+	tk.MustQuery(`select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2 HOUR_MICROSECOND);`).Check(
+		testkit.Rows("2007-03-28 22:08:27.800000"))
+	tk.MustQuery(`select DATE_ADD('2007-03-28 22:08:28',INTERVAL -2 DAY_MICROSECOND);`).Check(
+		testkit.Rows("2007-03-28 22:08:27.800000"))
+}
diff --git a/types/fsp.go b/types/fsp.go
@@ -86,9 +86,12 @@ func ParseFrac(s string, fsp int) (v int, overflow bool, err error) {
 	return
 }
 
-// alignFrac is used to generate alignment frac, like `100` -> `100000`
+// alignFrac is used to generate alignment frac, like `100` -> `100000` ,`-100` -> `-100000`
 func alignFrac(s string, fsp int) string {
 	sl := len(s)
+	if sl > 0 && s[0] == '-' {
+		sl = sl - 1
+	}
 	if sl < fsp {
 		return s + strings.Repeat("0", fsp-sl)
 	}

diff --git a/types/fsp_test.go b/types/fsp_test.go
@@ -115,4 +115,8 @@ func (s *FspTest) TestAlignFrac(c *C) {
 	c.Assert(obtained, Equals, "100000")
 	obtained = alignFrac("10000000000", 6)
 	c.Assert(obtained, Equals, "10000000000")
+	obtained = alignFrac("-100", 6)
+	c.Assert(obtained, Equals, "-100000")
+	obtained = alignFrac("-10000000000", 6)
+	c.Assert(obtained, Equals, "-10000000000")
 }