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) #19681

Merged
merged 6 commits into from Sep 17, 2020
Merged

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

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c278d4
cherry pick #19645 to release-3.0
wjhuang2016 Sep 1, 2020
a7597b5
Update ddl_api.go
wjhuang2016 Sep 3, 2020
d33b9d8
Merge branch 'release-3.0' into release-3.0-e62e1fec500e
ti-srebot Sep 7, 2020
75ba17e
Merge branch 'release-3.0' into release-3.0-e62e1fec500e
zimulala Sep 15, 2020
eecdaa5
Merge branch 'release-3.0' into release-3.0-e62e1fec500e
wjhuang2016 Sep 17, 2020
9accef5
Merge branch 'release-3.0' into release-3.0-e62e1fec500e
ti-srebot Sep 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions ddl/column_test.go
View file
Open in desktop
Expand Up @@ -922,6 +922,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
Expand Up @@ -2469,6 +2469,9 @@ func modifiable(origin *types.FieldType, to *types.FieldType) error {
}
}
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