ddl: fix create partition table not suport bit and year column type (#…

…7122)
pingcap · Jul 23, 2018 · 3d04c5e · 3d04c5e
1 parent a7ae09b
commit 3d04c5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/ddl/db_test.go b/ddl/db_test.go
@@ -1675,6 +1675,9 @@ func (s *testDBSuite) TestCreateTableWithPartition(c *C) {
 		partition p1 values less than (6)
 	);`)
 	c.Assert(err, IsNil)
+
+	s.tk.MustExec(`create TABLE t20 (c1 int,c2 bit(10)) partition by range(c2) (partition p0 values less than (10));`)
+	s.tk.MustExec(`create TABLE t21 (c1 int,c2 year) partition by range( c2 ) (partition p0 values less than (2000));`)
 }
 
 func (s *testDBSuite) TestTableDDLWithFloatType(c *C) {

diff --git a/ddl/partition.go b/ddl/partition.go
@@ -23,9 +23,9 @@ import (
 	"github.com/pingcap/tidb/ast"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/table"
+	"github.com/pingcap/tidb/types"
 )
 
 const (
@@ -148,8 +148,8 @@ func checkCreatePartitionValue(pi *model.PartitionInfo) error {
 
 // validRangePartitionType checks the type supported by the range partitioning key.
 func validRangePartitionType(col *table.Column) bool {
-	switch col.Tp {
-	case mysql.TypeTiny, mysql.TypeShort, mysql.TypeInt24, mysql.TypeLong, mysql.TypeLonglong:
+	switch col.FieldType.EvalType() {
+	case types.ETInt:
 		return true
 	default:
 		return false