Skip to content

MySQL: Set the character_set_results/character_set_client/character_set_connection session variables on connection setup #334

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

Merged
phillipleblanc merged 4 commits into from
May 12, 2025
+11 −14
Merged

MySQL: Set the character_set_results/character_set_client/character_set_connection session variables on connection setup #334

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
53483db
Support custom mysql_character_set_results configuration in mysql con…
Sevenannn May 10, 2025
c578639
Merge branch 'spiceai' into qianqian/mysql-character-set
Sevenannn May 12, 2025
7fdcca5
MySQL: Set character set to utf8 on connection setup
phillipleblanc May 12, 2025
61211c7
Remove error
phillipleblanc May 12, 2025
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
21 changes: 21 additions & 0 deletions src/sql/db_connection_pool/mysqlpool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ pub enum Error {

#[snafu(display("{message}\nEnsure the given MySQL database exists"))]
UnknownMySQLDatabase { message: String },

#[snafu(display("Unsupported value: '{value}' for 'character_set_results'. Only 'utf8mb3' and 'utf8mb4' are supported."))]
InvalidCharacterSetResults { value: String },
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -160,6 +163,24 @@ impl MySQLConnectionPool {

connection_string = connection_string.ssl_opts(ssl_opts);

if let Some(mysql_character_set_results) = params
.get("character_set_results")
.map(SecretBox::expose_secret)
{
match mysql_character_set_results {
"utf8mb3" | "utf8mb4" => {
Comment thread
phillipleblanc marked this conversation as resolved.
Outdated
connection_string = connection_string.setup(vec![format!(
"SET character_set_results = {mysql_character_set_results}"
)]);
}
_ => {
return Err(Error::InvalidCharacterSetResults {
value: mysql_character_set_results.to_string(),
})
}
}
}

let opts = mysql_async::Opts::from(connection_string);

verify_mysql_opts(&opts).await?;
Expand Down