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

Jump to bottom

ddl, planner, types: add M>=D checking for decimal column definition with default value #21845

Merged
merged 8 commits into from
Dec 29, 2020
Merged

ddl, planner, types: add M>=D checking for decimal column definition with default value #21845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8997d14
ddl, types: add M>=D checking for decimal column definition with defa…
TszKitLo40 Dec 17, 2020
9ea74a4
fix check_dev2
TszKitLo40 Dec 17, 2020
d7bbcf0
Add check in planner
TszKitLo40 Dec 17, 2020
0d503c3
nitpick
TszKitLo40 Dec 17, 2020
22acf54
add comment for setting the value
TszKitLo40 Dec 23, 2020
9304a13
remove useless code
TszKitLo40 Dec 24, 2020
d121d22
Merge branch 'master' into fix21835
TszKitLo40 Dec 29, 2020
da2a7fd
Merge branch 'master' into fix21835
TszKitLo40 Dec 29, 2020
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
8 changes: 8 additions & 0 deletions ddl/db_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2679,3 +2679,11 @@ func (s *testIntegrationSuite3) TestIssue22028(c *C) {
_, err = tk.Exec("ALTER TABLE t MODIFY COLUMN a DOUBLE(0,0);")
c.Assert(err.Error(), Equals, "[types:1439]Display width out of range for column 'a' (max = 255)")
}

func (s *testIntegrationSuite3) TestIssue21835(c *C) {
tk := testkit.NewTestKit(c, s.store)
tk.MustExec("use test")
tk.MustExec("drop table if exists t;")
_, err := tk.Exec("create table t( col decimal(1,2) not null default 0);")
c.Assert(err.Error(), Equals, "[types:1427]For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'col').")
}
6 changes: 6 additions & 0 deletions planner/core/preprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,9 @@ func checkColumn(colDef *ast.ColumnDef) error {
if tp.Flen > mysql.MaxFloatingTypeWidth || tp.Flen == 0 {
return types.ErrTooBigDisplayWidth.GenWithStackByArgs(colDef.Name.Name.O, mysql.MaxFloatingTypeWidth)
}
if tp.Flen < tp.Decimal {
return types.ErrMBiggerThanD.GenWithStackByArgs(colDef.Name.Name.O)
}
}
case mysql.TypeSet:
if len(tp.Elems) > mysql.MaxTypeSetMembers {
Expand All @@ -993,6 +996,9 @@ func checkColumn(colDef *ast.ColumnDef) error {
return types.ErrTooBigPrecision.GenWithStackByArgs(tp.Flen, colDef.Name.Name.O, mysql.MaxDecimalWidth)
}

if tp.Flen < tp.Decimal {
return types.ErrMBiggerThanD.GenWithStackByArgs(colDef.Name.Name.O)
}
// If decimal and flen all equals 0, just set flen to default value.
if tp.Decimal == 0 && tp.Flen == 0 {
defaultFlen, _ := mysql.GetDefaultFieldLengthAndDecimal(mysql.TypeNewDecimal)
Expand Down