itsscb/sqlx
1
0
Fork 0
mirror of https://github.com/launchbadge/sqlx.git synced 2025-10-05 08:45:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed to collation which is the actual name.

Browse Source
This commit is contained in:
alu 2023-07-25 13:37:04 +09:00 committed by Austin Bonander
parent 92de9d42a6
commit ce6d75208b
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sqlx-mysql/src/protocol/text/column.rs
View File

@ -112,7 +112,7 @@ pub(crate) struct ColumnDefinition {
table: Bytes, table: Bytes,
alias: Bytes, alias: Bytes,
name: Bytes, name: Bytes,
pub(crate) char_set: u16, pub(crate) collation: u16,
pub(crate) max_size: u32, pub(crate) max_size: u32,
pub(crate) r#type: ColumnType, pub(crate) r#type: ColumnType,
pub(crate) flags: ColumnFlags, pub(crate) flags: ColumnFlags,
@ -142,7 +142,7 @@ impl Decode<'_, Capabilities> for ColumnDefinition {
let alias = buf.get_bytes_lenenc(); let alias = buf.get_bytes_lenenc();
let name = buf.get_bytes_lenenc(); let name = buf.get_bytes_lenenc();
let _next_len = buf.get_uint_lenenc(); // always 0x0c let _next_len = buf.get_uint_lenenc(); // always 0x0c
let char_set = buf.get_u16_le(); let collation = buf.get_u16_le();
let max_size = buf.get_u32_le(); let max_size = buf.get_u32_le();
let type_id = buf.get_u8(); let type_id = buf.get_u8();
let flags = buf.get_u16_le(); let flags = buf.get_u16_le();
@ -155,7 +155,7 @@ impl Decode<'_, Capabilities> for ColumnDefinition {
table, table,
alias, alias,
name, name,
char_set, collation,
max_size, max_size,
r#type: ColumnType::try_from_u16(type_id)?, r#type: ColumnType::try_from_u16(type_id)?,
flags: ColumnFlags::from_bits_truncate(flags), flags: ColumnFlags::from_bits_truncate(flags),
@ -167,11 +167,11 @@ impl Decode<'_, Capabilities> for ColumnDefinition {
impl ColumnType { impl ColumnType {
pub(crate) fn name( pub(crate) fn name(
self, self,
char_set: u16, collation: u16,
flags: ColumnFlags, flags: ColumnFlags,
max_size: Option<u32>, max_size: Option<u32>,
) -> &'static str { ) -> &'static str {
let is_binary = char_set == 63; let is_binary = collation == 63;
let is_unsigned = flags.contains(ColumnFlags::UNSIGNED); let is_unsigned = flags.contains(ColumnFlags::UNSIGNED);
let is_enum = flags.contains(ColumnFlags::ENUM); let is_enum = flags.contains(ColumnFlags::ENUM);

12
sqlx-mysql/src/type_info.rs
View File

@ -10,7 +10,7 @@ use crate::protocol::text::{ColumnDefinition, ColumnFlags, ColumnType};
pub struct MySqlTypeInfo { pub struct MySqlTypeInfo {
pub(crate) r#type: ColumnType, pub(crate) r#type: ColumnType,
pub(crate) flags: ColumnFlags, pub(crate) flags: ColumnFlags,
pub(crate) char_set: u16, pub(crate) collation: u16,
// [max_size] for integer types, this is (M) in BIT(M) or TINYINT(M) // [max_size] for integer types, this is (M) in BIT(M) or TINYINT(M)
#[cfg_attr(feature = "offline", serde(default))] #[cfg_attr(feature = "offline", serde(default))]
@ -22,7 +22,7 @@ impl MySqlTypeInfo {
Self { Self {
r#type: ty, r#type: ty,
flags: ColumnFlags::BINARY, flags: ColumnFlags::BINARY,
char_set: 63, collation: 63,
max_size: None, max_size: None,
} }
} }
@ -32,7 +32,7 @@ impl MySqlTypeInfo {
Self { Self {
r#type: ColumnType::Enum, r#type: ColumnType::Enum,
flags: ColumnFlags::BINARY, flags: ColumnFlags::BINARY,
char_set: 63, collation: 63,
max_size: None, max_size: None,
} }
} }
@ -55,7 +55,7 @@ impl MySqlTypeInfo {
Self { Self {
r#type: column.r#type, r#type: column.r#type,
flags: column.flags, flags: column.flags,
char_set: column.char_set, collation: column.collation,
max_size: Some(column.max_size), max_size: Some(column.max_size),
} }
} }
@ -73,7 +73,7 @@ impl TypeInfo for MySqlTypeInfo {
} }
fn name(&self) -> &str { fn name(&self) -> &str {
self.r#type.name(self.char_set, self.flags, self.max_size) self.r#type.name(self.collation, self.flags, self.max_size)
} }
} }
@ -102,7 +102,7 @@ impl PartialEq<MySqlTypeInfo> for MySqlTypeInfo {
| ColumnType::String | ColumnType::String
| ColumnType::VarString | ColumnType::VarString
| ColumnType::Enum => { | ColumnType::Enum => {
return self.char_set == other.char_set; return self.collation == other.collation;
} }
_ => {} _ => {}

2
sqlx-mysql/src/types/bool.rs
View File

@ -12,7 +12,7 @@ impl Type<MySql> for bool {
// MySQL has no actual `BOOLEAN` type, the type is an alias of `TINYINT(1)` // MySQL has no actual `BOOLEAN` type, the type is an alias of `TINYINT(1)`
MySqlTypeInfo { MySqlTypeInfo {
flags: ColumnFlags::BINARY | ColumnFlags::UNSIGNED, flags: ColumnFlags::BINARY | ColumnFlags::UNSIGNED,
char_set: 63, collation: 63,
max_size: Some(1), max_size: Some(1),
r#type: ColumnType::Tiny, r#type: ColumnType::Tiny,
} }

6
sqlx-mysql/src/types/str.rs
View File

@ -17,8 +17,8 @@ const COLLATE_UTF8MB4_0900_AI_CI: u16 = 255;
impl Type<MySql> for str { impl Type<MySql> for str {
fn type_info() -> MySqlTypeInfo { fn type_info() -> MySqlTypeInfo {
MySqlTypeInfo { MySqlTypeInfo {
r#type: ColumnType::VarString, // VARCHAR r#type: ColumnType::VarString, // VARCHAR
char_set: COLLATE_UTF8MB4_UNICODE_CI, // utf8mb4_unicode_ci collation: COLLATE_UTF8MB4_UNICODE_CI, // utf8mb4_unicode_ci
flags: ColumnFlags::empty(), flags: ColumnFlags::empty(),
max_size: None, max_size: None,
} }
@ -37,7 +37,7 @@ impl Type<MySql> for str {
| ColumnType::VarString | ColumnType::VarString
| ColumnType::Enum | ColumnType::Enum
) && matches!( ) && matches!(
ty.char_set, ty.collation,
COLLATE_UTF8MB4_UNICODE_CI COLLATE_UTF8MB4_UNICODE_CI
| COLLATE_UTF8_UNICODE_CI | COLLATE_UTF8_UNICODE_CI
| COLLATE_UTF8_GENERAL_CI | COLLATE_UTF8_GENERAL_CI

2
sqlx-mysql/src/types/uint.rs
View File

@ -10,7 +10,7 @@ fn uint_type_info(ty: ColumnType) -> MySqlTypeInfo {
MySqlTypeInfo { MySqlTypeInfo {
r#type: ty, r#type: ty,
flags: ColumnFlags::BINARY | ColumnFlags::UNSIGNED, flags: ColumnFlags::BINARY | ColumnFlags::UNSIGNED,
char_set: 63, collation: 63,
max_size: None, max_size: None,
} }
} }