From ffc1aacff91d989be35953bee9fb997260cceafa Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 17 Sep 2024 22:51:22 -0400 Subject: [PATCH] fix `tokens` and `enums` crates, mysql_queries etc. are broken --- .../tokens/src/macros/impl_mysql_token_from_row.rs | 14 ++++++-------- .../tokens/src/traits/mysql_token_from_row.rs | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/crates/_types/tokens/src/macros/impl_mysql_token_from_row.rs b/crates/_types/tokens/src/macros/impl_mysql_token_from_row.rs index c35fee25c2..9e40097ba7 100644 --- a/crates/_types/tokens/src/macros/impl_mysql_token_from_row.rs +++ b/crates/_types/tokens/src/macros/impl_mysql_token_from_row.rs @@ -10,11 +10,10 @@ macro_rules! impl_mysql_token_from_row { // Try to convert a MySQL row and named field into the value type (for non-nullable fields). impl crate::traits::mysql_token_from_row::MySqlTokenFromRow<$t> for $t { - fn try_from_mysql_row(row: &sqlx::mysql::MySqlRow, field_name: &str) -> Result<$t, sqlx_core::Error> { + fn try_from_mysql_row(row: &sqlx_mysql::MySqlRow, field_name: &str) -> Result<$t, sqlx_core::Error> { #[allow(unused_imports)] - //use sqlx::Row; - use sqlx_core::row::Row as OtherRow; - use sqlx::Row; + use sqlx_core::row::Row; + //use sqlx::Row as OtherRow; // NB(bt,2023-12-05): For now only string encodings are considered. // We may want to revisit in the future if we deal with binary data. @@ -24,11 +23,10 @@ macro_rules! impl_mysql_token_from_row { } // Try to convert a MySQL row and named field into the value type (for nullable fields). - fn try_from_mysql_row_nullable(row: &sqlx::mysql::MySqlRow, field_name: &str) -> Result, sqlx_core::Error> { + fn try_from_mysql_row_nullable(row: &sqlx_mysql::MySqlRow, field_name: &str) -> Result, sqlx_core::Error> { #[allow(unused_imports)] - //use sqlx::Row; - use sqlx_core::row::Row as OtherRow; - use sqlx::Row; + use sqlx_core::row::Row; + //use sqlx::Row as OtherRow; // NB(bt,2023-12-05): For now only string encodings are considered. // We may want to revisit in the future if we deal with binary data. diff --git a/crates/_types/tokens/src/traits/mysql_token_from_row.rs b/crates/_types/tokens/src/traits/mysql_token_from_row.rs index e00294c5ba..6ec0a02162 100644 --- a/crates/_types/tokens/src/traits/mysql_token_from_row.rs +++ b/crates/_types/tokens/src/traits/mysql_token_from_row.rs @@ -1,5 +1,5 @@ -//use sqlx_mysql::MySqlRow; -use sqlx::mysql::MySqlRow; +use sqlx_mysql::MySqlRow; +//use sqlx::mysql::MySqlRow; // UPGRADE NOTES // sqlx 0.7.2 --> 0.8.2