From e54d030381da5e2629b100c0b11b4a2d11245f2f Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Mon, 8 Jun 2020 02:30:21 -0700 Subject: [PATCH] fix(mysql): str should produce VARCHAR not BLOB --- sqlx-core/src/mysql/types/str.rs | 4 ++-- tests/mysql/describe.rs | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sqlx-core/src/mysql/types/str.rs b/sqlx-core/src/mysql/types/str.rs index 17a6464e..d3ce31cb 100644 --- a/sqlx-core/src/mysql/types/str.rs +++ b/sqlx-core/src/mysql/types/str.rs @@ -9,8 +9,8 @@ use crate::types::Type; impl Type for str { fn type_info() -> MySqlTypeInfo { MySqlTypeInfo { - r#type: ColumnType::Blob, // TEXT - char_set: 224, // utf8mb4_unicode_ci + r#type: ColumnType::VarString, // VARCHAR + char_set: 224, // utf8mb4_unicode_ci flags: ColumnFlags::empty(), } } diff --git a/tests/mysql/describe.rs b/tests/mysql/describe.rs index 47796ef1..5176cf8b 100644 --- a/tests/mysql/describe.rs +++ b/tests/mysql/describe.rs @@ -1,6 +1,5 @@ -use futures::TryStreamExt; -use sqlx::mysql::{MySql, MySqlRow}; -use sqlx::{Connection, Executor, Row}; +use sqlx::mysql::MySql; +use sqlx::Executor; use sqlx_core::describe::Column; use sqlx_test::new;