schemadiff: assume default collation for textual column when collation is undefined
#16000
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: Shlomi Noach <[email protected]>
Signed-off-by: Shlomi Noach <[email protected]>
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
shlomi-noach
added
Type: Bug
Component: Query Serving
and removed
NeedsDescriptionUpdate
…ation Signed-off-by: Shlomi Noach <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #16000 +/- ##
==========================================
- Coverage 68.47% 68.25% -0.23%
==========================================
Files 1562 1562
Lines 197083 197206 +123
==========================================
- Hits 134962 134598 -364
- Misses 62121 62608 +487 ☔ View full report in Codecov by Sentry. |
mattlord
approved these changes
May 23, 2024
go/vt/schemadiff/column.go
Outdated
| @@ -104,7 +104,17 @@ func (c *ColumnDefinitionEntity) ColumnDiff( | |||
| ) (*ModifyColumnDiff, error) { | |||
| if c.IsTextual() || other.IsTextual() { | |||
| // We will now denormalize the columns charset & collate as needed (if empty, populate from table.) | |||
|
|
|||
| // This column definition | |||
There was a problem hiding this comment.
Is this the full comment? 🙂 I'm assuming it should be ~
// This column definition is using the implied / default collation for the character set
// so we need to determine the default/actual collation used for the specified character set
// based on the MySQL version being used.
There was a problem hiding this comment.
I've updated this and other comments.
go/vt/schemadiff/column.go
Outdated
| @@ -137,6 +147,17 @@ func (c *ColumnDefinitionEntity) ColumnDiff( | |||
| c.columnDefinition.Type.Options.Collate = env.CollationEnv().LookupName(collation) | |||
| } | |||
| } | |||
| // other column definition | |||
There was a problem hiding this comment.
Ah, I see. So "this" and "other" are the two things being diffed. The other related comments are still worthwhile though IMO.
There was a problem hiding this comment.
I've updated this and other comments.
Signed-off-by: Shlomi Noach <[email protected]>
dbussink
approved these changes
May 24, 2024
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.
Description
Fixes #15999. When looking at textual columns, if the character set is defined and the collation is not,
schemadiffassumes the default collation for that character set.Related Issue(s)
#15999
cc @lizztheblizz
Checklist
Deployment Notes