planner/core: add bit column test about display width range (#11985)

pingcap · Sep 6, 2019 · 702854f · 702854f
1 parent dd25ed0
commit 702854f
Show file tree

Hide file tree

Showing 7 changed files with 252 additions and 250 deletions.
diff --git a/ddl/db_integration_test.go b/ddl/db_integration_test.go
diff --git a/ddl/db_partition_test.go b/ddl/db_partition_test.go
diff --git a/ddl/db_test.go b/ddl/db_test.go
diff --git a/ddl/serial_test.go b/ddl/serial_test.go
@@ -407,7 +407,7 @@ func (s *testSerialSuite) TestCanceledJobTakeTime(c *C) {
 	ddl.WaitTimeWhenErrorOccured = 1 * time.Second
 	defer func() { ddl.WaitTimeWhenErrorOccured = originalWT }()
 	startTime := time.Now()
-	assertErrorCode(c, tk, "alter table t_cjtt add column b int", mysql.ErrNoSuchTable)
+	tk.MustGetErrCode("alter table t_cjtt add column b int", mysql.ErrNoSuchTable)
 	sub := time.Since(startTime)
 	c.Assert(sub, Less, ddl.WaitTimeWhenErrorOccured)
 }

diff --git a/planner/core/integration_test.go b/planner/core/integration_test.go
@@ -15,6 +15,7 @@ package core_test
 
 import (
 	. "github.com/pingcap/check"
+	"github.com/pingcap/parser/mysql"
 	"github.com/pingcap/tidb/util/testkit"
 )
 
@@ -77,7 +78,7 @@ func (s *testIntegrationSuite) TestPpdWithSetVar(c *C) {
 	tk.MustQuery("select t01.c1,t01.c2,t01.c3 from (select t1.*,@c3:=@c3+1 as c3 from (select t.*,@c3:=0 from t order by t.c1)t1)t01 where t01.c3=2 and t01.c2='d'").Check(testkit.Rows("2 d 2"))
 }
 
-func (s *testIntegrationSuite) BitColErrorMessage(c *C) {
+func (s *testIntegrationSuite) TestBitColErrorMessage(c *C) {
 	store, dom, err := newStoreWithBootstrap()
 	c.Assert(err, IsNil)
 	tk := testkit.NewTestKit(c, store)
@@ -92,8 +93,6 @@ func (s *testIntegrationSuite) BitColErrorMessage(c *C) {
 	tk.MustExec("drop table bit_col_t")
 	tk.MustExec("create table bit_col_t (a bit(1))")
 	tk.MustExec("drop table bit_col_t")
-	_, err = tk.Exec("create table bit_col_t (a bit(0))")
-	c.Assert(err, NotNil)
-	_, err = tk.Exec("create table bit_col_t (a bit(65))")
-	c.Assert(err, NotNil)
+	tk.MustGetErrCode("create table bit_col_t (a bit(0))", mysql.ErrInvalidFieldSize)
+	tk.MustGetErrCode("create table bit_col_t (a bit(65))", mysql.ErrTooBigDisplaywidth)
 }
diff --git a/types/errors.go b/types/errors.go
@@ -125,6 +125,7 @@ func init() {
 		codeTruncatedWrongValue:      mysql.ErrTruncatedWrongValue,
 		codeUnknown:                  mysql.ErrUnknown,
 		codeInvalidDefault:           mysql.ErrInvalidDefault,
+		codeInvalidFieldSize:         mysql.ErrInvalidFieldSize,
 		codeMBiggerThanD:             mysql.ErrMBiggerThanD,
 		codeDataOutOfRange:           mysql.ErrWarnDataOutOfRange,
 		codeDuplicatedValueInType:    mysql.ErrDuplicatedValueInType,

diff --git a/util/testkit/testkit.go b/util/testkit/testkit.go
@@ -26,6 +26,7 @@ import (
 	"github.com/pingcap/check"
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/model"
+	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/session"
@@ -251,6 +252,17 @@ func (tk *TestKit) ExecToErr(sql string, args ...interface{}) error {
 	return err
 }
 
+// MustGetErrCode executes a sql statement and assert it's error code.
+func (tk *TestKit) MustGetErrCode(sql string, errCode int) {
+	_, err := tk.Exec(sql)
+	tk.c.Assert(err, check.NotNil)
+	originErr := errors.Cause(err)
+	tErr, ok := originErr.(*terror.Error)
+	tk.c.Assert(ok, check.IsTrue, check.Commentf("expect type 'terror.Error', but obtain '%T'", originErr))
+	sqlErr := tErr.ToSQLError()
+	tk.c.Assert(int(sqlErr.Code), check.Equals, errCode, check.Commentf("Assertion failed, origin err:\n  %v", sqlErr))
+}
+
 // ResultSetToResult converts sqlexec.RecordSet to testkit.Result.
 // It is used to check results of execute statement in binary mode.
 func (tk *TestKit) ResultSetToResult(rs sqlexec.RecordSet, comment check.CommentInterface) *Result {