MySQL: Add support for DEFAULT CHARACTER SET in CREATE DATABASE #2182
+155
−0
Conversation
This file contains hidden or 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
Parse MySQL-style [DEFAULT] CHARACTER SET and [DEFAULT] COLLATE options in CREATE DATABASE statements. This adds two new fields to CreateDatabase: default_charset and default_collation. Supports the following syntax variants: - DEFAULT CHARACTER SET [=] charset_name - CHARACTER SET [=] charset_name - DEFAULT CHARSET [=] charset_name - CHARSET [=] charset_name - DEFAULT COLLATE [=] collation_name - COLLATE [=] collation_name
iffyio
reviewed
Feb 3, 2026
| pub storage_serialization_policy: Option<StorageSerializationPolicy>, | ||
| /// Optional comment attached to the database. | ||
| pub comment: Option<String>, | ||
| /// Optional default character set (MySQL). |
Contributor
There was a problem hiding this comment.
can we include a link to the mysql documentation for the doc comments?
Comment on lines
+5320
to
+5323
| self.expect_token(&Token::Eq).ok(); | ||
| default_charset = Some(self.parse_identifier()?.value); | ||
| } else if self.parse_keyword(Keyword::COLLATE) { | ||
| self.expect_token(&Token::Eq).ok(); |
Contributor
There was a problem hiding this comment.
can we handle the errors in the calls to expect_token?
| None | ||
| }; | ||
|
|
||
| // Parse MySQL-style [DEFAULT] CHARACTER SET and [DEFAULT] COLLATE options |
Contributor
There was a problem hiding this comment.
Can we move the default_charset and default_collation closer here to the loop? (misread for a second wondering if the values were being previously set elsewhere before the loop)
| // Parse MySQL-style [DEFAULT] CHARACTER SET and [DEFAULT] COLLATE options | ||
| loop { | ||
| let has_default = self.parse_keyword(Keyword::DEFAULT); | ||
| if self.parse_keywords(&[Keyword::CHARACTER, Keyword::SET]) |
Contributor
There was a problem hiding this comment.
Suggested change
| if self.parse_keywords(&[Keyword::CHARACTER, Keyword::SET]) | |
| if default_charset.is_none() && self.parse_keywords(&[Keyword::CHARACTER, Keyword::SET]) |
| { | ||
| self.expect_token(&Token::Eq).ok(); | ||
| default_charset = Some(self.parse_identifier()?.value); | ||
| } else if self.parse_keyword(Keyword::COLLATE) { |
Contributor
There was a problem hiding this comment.
Suggested change
| } else if self.parse_keyword(Keyword::COLLATE) { | |
| } else if default_collation.is_none() && self.parse_keyword(Keyword::COLLATE) { |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Parse MySQL-style [DEFAULT] CHARACTER SET and [DEFAULT] COLLATE options in CREATE DATABASE statements. This adds two new fields to CreateDatabase: default_charset and default_collation.
Supports the following syntax variants: