*: incorrect error message of inserting enum & set (#19380) #19950
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: ti-srebot <[email protected]>
|
/run-all-tests |
ti-srebot
added
component/expression
contribution
qw4990
reviewed
Sep 11, 2020
table/column.go
Outdated
| @@ -181,7 +181,11 @@ func CastValue(ctx sessionctx.Context, val types.Datum, col *model.ColumnInfo, r | |||
| if types.ErrOverflow.Equal(err) && returnOverflow { | |||
| return casted, err | |||
| } | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Please fix the conflict @Patrick0308 .
There was a problem hiding this comment.
Do I need create a new pr to fix this problem?
There was a problem hiding this comment.
What should I do? @qw4990
XuHuaiyu
reviewed
Sep 14, 2020
|
LGTM |
|
PTAL @qw4990 |
Patrick0308
reviewed
Sep 15, 2020
| @@ -181,7 +181,7 @@ func CastValue(ctx sessionctx.Context, val types.Datum, col *model.ColumnInfo, r | |||
| if types.ErrOverflow.Equal(err) && returnOverflow { | |||
| return casted, err | |||
| } | |||
| if types.ErrTruncated.Equal(err) { | |||
| if err != nil && types.ErrTruncated.Equal(err) && col.Tp != mysql.TypeSet && col.Tp != mysql.TypeEnum { | |||
There was a problem hiding this comment.
We don't need err!=nil because in types.ErrTruncated.Equal(err) fix nil problem.
ti-srebot
added
status/LGT2
lzmhhh123
approved these changes
Sep 21, 2020
|
/merge |
ti-srebot
added
the
status/can-merge
|
Your auto merge job has been accepted, waiting for:
|
|
/run-all-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cherry-pick #19380 to release-4.0
What problem does this PR solve?
Issue Number: close #19229
Problem Summary:
What is changed and how it works?
What's Changed: Change error code and error info when insert value.
Check List
Tests
Release note