fix tokens and enums crates, mysql_queries etc. are broken

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<Option<$t>, sqlx_core::Error> {
+      fn try_from_mysql_row_nullable(row: &sqlx_mysql::MySqlRow, field_name: &str) -> Result<Option<$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.

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