Merge branch 'master' into no-async-commit-config

pingcap · Feb 26, 2021 · 10084d8 · 10084d8
2 parents 750dece + 03109ad
commit 10084d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/circle.yml b/circle.yml
@@ -3,7 +3,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: golang:1.15
+      - image: golang:1.16
     working_directory: /go/src/github.com/pingcap/tidb
     steps:
       - checkout

diff --git a/session/session_test.go b/session/session_test.go
@@ -4207,11 +4207,10 @@ func (s *testSessionSerialSuite) TestParseWithParams(c *C) {
 	c.Assert(err, IsNil)
 
 	var sb strings.Builder
-	ctx := format.NewRestoreCtx(0, &sb)
+	ctx := format.NewRestoreCtx(format.RestoreStringDoubleQuotes, &sb)
 	err = stmt.Restore(ctx)
 	c.Assert(err, IsNil)
-	// FIXME: well... so the restore function is vulnerable...
-	c.Assert(sb.String(), Equals, "SELECT * FROM test WHERE name=_utf8mb4\xbf' OR 1=1 /* LIMIT 1")
+	c.Assert(sb.String(), Equals, "SELECT * FROM test WHERE name=_utf8mb4\"\xbf' OR 1=1 /*\" LIMIT 1")
 
 	// test invalid sql
 	_, err = exec.ParseWithParams(context.TODO(), "SELECT")