From d8142a8fa3afd2e5443ba8fc12bf2cabdee6447b Mon Sep 17 00:00:00 2001 From: Mike Cronce Date: Sun, 30 Aug 2020 14:46:50 -0400 Subject: [PATCH] sqlx-core/src/mysql/types/str.rs: str::compatible(): Added support for charset number 33 (utf8 COLLATE utf8_general_ci) --- sqlx-core/src/mysql/types/str.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sqlx-core/src/mysql/types/str.rs b/sqlx-core/src/mysql/types/str.rs index 044338c1..3e7e73f7 100644 --- a/sqlx-core/src/mysql/types/str.rs +++ b/sqlx-core/src/mysql/types/str.rs @@ -6,6 +6,7 @@ use crate::mysql::protocol::text::{ColumnFlags, ColumnType}; use crate::mysql::{MySql, MySqlTypeInfo, MySqlValueRef}; use crate::types::Type; +const COLLATE_UTF8_GENERAL_CI: u16 = 33; const COLLATE_UTF8_UNICODE_CI: u16 = 192; const COLLATE_UTF8MB4_UNICODE_CI: u16 = 224; @@ -31,8 +32,12 @@ impl Type for str { | ColumnType::String | ColumnType::VarString | ColumnType::Enum - ) && (ty.char_set == COLLATE_UTF8MB4_UNICODE_CI as u16 - || ty.char_set == COLLATE_UTF8_UNICODE_CI as u16) + ) && matches!( + ty.char_set, + COLLATE_UTF8MB4_UNICODE_CI + | COLLATE_UTF8_UNICODE_CI + | COLLATE_UTF8_GENERAL_CI + ) } }