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: forbidden changing decimal to int (#19645) #19682

Merged
merged 6 commits into from
Sep 3, 2020
Merged

ddl: forbidden changing decimal to int (#19645) #19682

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
315ae37
cherry pick #19645 to release-4.0
wjhuang2016 Sep 1, 2020
ed08f24
Update ddl_api.go
wjhuang2016 Sep 1, 2020
5f4641d
Merge branch 'release-4.0' into release-4.0-e62e1fec500e
ti-srebot Sep 2, 2020
8345ce5
Merge branch 'release-4.0' into release-4.0-e62e1fec500e
ti-srebot Sep 2, 2020
1341da4
Merge branch 'release-4.0' into release-4.0-e62e1fec500e
ti-srebot Sep 2, 2020
237e01c
Merge branch 'release-4.0' into release-4.0-e62e1fec500e
zz-jason Sep 3, 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
3 changes: 3 additions & 0 deletions ddl/column_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,6 +948,9 @@ func (s *testColumnSuite) TestModifyColumn(c *C) {
{"decimal(2,1)", "decimal(3,2)", errUnsupportedModifyColumn.GenWithStackByArgs("can't change decimal column precision")},
{"decimal(2,1)", "decimal(2,2)", errUnsupportedModifyColumn.GenWithStackByArgs("can't change decimal column precision")},
{"decimal(2,1)", "decimal(2,1)", nil},
{"decimal(2,1)", "int", errUnsupportedModifyColumn.GenWithStackByArgs("type int(11) not match origin decimal(2,1)")},
{"decimal", "int", errUnsupportedModifyColumn.GenWithStackByArgs("type int(11) not match origin decimal(11,0)")},
{"decimal(2,1)", "bigint", errUnsupportedModifyColumn.GenWithStackByArgs("type bigint(20) not match origin decimal(2,1)")},
}
for _, tt := range tests {
ftA := s.colDefStrToFieldType(c, tt.origin)
Expand Down
3 changes: 3 additions & 0 deletions ddl/ddl_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2750,6 +2750,9 @@ func checkModifyTypes(origin *types.FieldType, to *types.FieldType, needRewriteC
}
}
case mysql.TypeNewDecimal:
if origin.Tp != to.Tp {
return errUnsupportedModifyColumn.GenWithStackByArgs(unsupportedMsg)
}
// The root cause is modifying decimal precision needs to rewrite binary representation of that decimal.
if to.Flen != origin.Flen || to.Decimal != origin.Decimal {
return errUnsupportedModifyColumn.GenWithStackByArgs("can't change decimal column precision")
Expand Down