database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ddl: add fsp checking for time/timestamp/datetime column definition (#7294)

Browse Source
This commit is contained in:
lysu
2018-08-07 16:39:54 +08:00
committed by Jack Yu
parent f6dbad0f5c
commit 61b4ff2321
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ddl/db_test.go
View File

@ -1739,6 +1739,28 @@ func (s *testDBSuite) TestTableDDLWithFloatType(c *C) {
s.mustExec(c, "drop table t")
}
func (s *testDBSuite) TestTableDDLWithTimeType(c *C) {
s.tk.MustExec("use test")
s.tk.MustExec("drop table if exists t")
s.testErrorCode(c, "create table t (a time(7))", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "create table t (a datetime(7))", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "create table t (a timestamp(7))", tmysql.ErrTooBigPrecision)
_, err := s.tk.Exec("create table t (a time(-1))")
c.Assert(err, NotNil)
s.mustExec(c, "create table t (a datetime)")
s.testErrorCode(c, "alter table t add column b time(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t add column b datetime(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t add column b timestamp(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t modify column a time(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t modify column a datetime(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t modify column a timestamp(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t change column a aa time(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t change column a aa datetime(7)", tmysql.ErrTooBigPrecision)
s.testErrorCode(c, "alter table t change column a aa timestamp(7)", tmysql.ErrTooBigPrecision)
s.mustExec(c, "alter table t change column a aa timestamp(0)")
s.mustExec(c, "drop table t")
}
func (s *testDBSuite) TestTruncateTable(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")

20
ddl/ddl_api.go
View File

@ -597,23 +597,27 @@ func checkTooManyColumns(colDefs []*ast.ColumnDef) error {
return nil
}
// checkPointTypeColumns checks multiple decimal/float/double columns.
func checkPointTypeColumns(colDefs []*ast.ColumnDef) error {
// checkColumnsAttributes checks attributes for multiple columns.
func checkColumnsAttributes(colDefs []*ast.ColumnDef) error {
for _, colDef := range colDefs {
if err := checkPointTypeColumn(colDef.Name.OrigColName(), colDef.Tp); err != nil {
if err := checkColumnAttributes(colDef.Name.OrigColName(), colDef.Tp); err != nil {
return errors.Trace(err)
}
}
return nil
}
// checkPointTypeColumn checks a decimal/float/double column.
func checkPointTypeColumn(colName string, tp *types.FieldType) error {
// checkColumnAttributes check attributes for single column.
func checkColumnAttributes(colName string, tp *types.FieldType) error {
switch tp.Tp {
case mysql.TypeNewDecimal, mysql.TypeDouble, mysql.TypeFloat:
if tp.Flen < tp.Decimal {
return types.ErrMBiggerThanD.GenByArgs(colName)
}
case mysql.TypeDatetime, mysql.TypeDuration, mysql.TypeTimestamp:
if tp.Decimal != types.UnspecifiedFsp && (tp.Decimal < types.MinFsp || tp.Decimal > types.MaxFsp) {
return types.ErrTooBigPrecision.GenByArgs(tp.Decimal, colName, types.MaxFsp)
}
}
return nil
}
@ -871,7 +875,7 @@ func (d *ddl) CreateTable(ctx sessionctx.Context, s *ast.CreateTableStmt) (err e
return errors.Trace(err)
}
if err = checkPointTypeColumns(colDefs); err != nil {
if err = checkColumnsAttributes(colDefs); err != nil {
return errors.Trace(err)
}
@ -1193,7 +1197,7 @@ func (d *ddl) AddColumn(ctx sessionctx.Context, ti ast.Ident, spec *ast.AlterTab
}
colName := specNewColumn.Name.Name.O
if err = checkPointTypeColumn(colName, specNewColumn.Tp); err != nil {
if err = checkColumnAttributes(colName, specNewColumn.Tp); err != nil {
return errors.Trace(err)
}
@ -1569,7 +1573,7 @@ func (d *ddl) getModifiableColumnJob(ctx sessionctx.Context, ident ast.Ident, or
return nil, errors.Trace(errUnsupportedModifyColumn)
}
if err = checkPointTypeColumn(specNewColumn.Name.OrigColName(), specNewColumn.Tp); err != nil {
if err = checkColumnAttributes(specNewColumn.Name.OrigColName(), specNewColumn.Tp); err != nil {
return nil, errors.Trace(err)
}