Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jul 23, 2018
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07a1945
ddl: fix create partition table not suport bit and year column type
crazycs520 Jul 23, 2018
fa01093
Merge branch 'master' into fix_create_partition_table
zimulala Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ddl/db_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions ddl/partition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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
Expand Down