Blocking Issues: upgrade to SQLx 0.8 on hold, just testing a workarou…

…nd, not an ideal fix (launchbadge/sqlx#3387)
SeaQL · Aug 2, 2024 · a709e34 · a709e34
1 parent 1147bc9
commit a709e34
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/mysql/query/column.rs b/src/mysql/query/column.rs
@@ -80,13 +80,17 @@ impl From<&MySqlRow> for ColumnQueryResult {
         use crate::sqlx_types::Row;
         Self {
             column_name: row.get(0),
-            column_type: row.get(1),
+            column_type: String::from_utf8(row.get::<Vec<u8>, _>(1)).unwrap(),
             is_nullable: row.get(2),
-            column_key: row.get(3),
-            column_default: row.get(4),
+            column_key: String::from_utf8(row.get::<Vec<u8>, _>(3)).unwrap(),
+            column_default: row
+                .get::<Option<Vec<u8>>, _>(4)
+                .map(|v| String::from_utf8(v).unwrap()),
             extra: row.get(5),
-            generation_expression: row.get(6),
-            column_comment: row.get(7),
+            generation_expression: row
+                .get::<Option<Vec<u8>>, _>(6)
+                .map(|v| String::from_utf8(v).unwrap()),
+            column_comment: String::from_utf8(row.get::<Vec<u8>, _>(7)).unwrap(),
         }
     }
 }

diff --git a/src/mysql/query/foreign_key.rs b/src/mysql/query/foreign_key.rs
@@ -89,10 +89,10 @@ impl From<&MySqlRow> for ForeignKeyQueryResult {
         Self {
             constraint_name: row.get(0),
             column_name: row.get(1),
-            referenced_table_name: row.get(2),
-            referenced_column_name: row.get(3),
-            update_rule: row.get(4),
-            delete_rule: row.get(5),
+            referenced_table_name: String::from_utf8(row.get::<Vec<u8>, _>(2)).unwrap(),
+            referenced_column_name: String::from_utf8(row.get::<Vec<u8>, _>(3)).unwrap(),
+            update_rule: String::from_utf8(row.get::<Vec<u8>, _>(4)).unwrap(),
+            delete_rule: String::from_utf8(row.get::<Vec<u8>, _>(5)).unwrap(),
         }
     }
 }

diff --git a/src/mysql/query/index.rs b/src/mysql/query/index.rs
@@ -84,8 +84,8 @@ impl From<&MySqlRow> for IndexQueryResult {
             collation: row.get(3),
             sub_part: row.get(4),
             nullable: row.get(5),
-            index_type: row.get(6),
-            index_comment: row.get(7),
+            index_type: String::from_utf8(row.get::<Vec<u8>, _>(6)).unwrap(),
+            index_comment: String::from_utf8(row.get::<Vec<u8>, _>(7)).unwrap(),
             expression: row.get(8),
         }
     }

diff --git a/src/mysql/query/table.rs b/src/mysql/query/table.rs
@@ -91,7 +91,7 @@ impl From<&MySqlRow> for TableQueryResult {
     fn from(row: &MySqlRow) -> Self {
         use crate::sqlx_types::Row;
         Self {
-            table_name: row.get(0),
+            table_name: String::from_utf8(row.get::<Vec<u8>, _>(0)).unwrap(),
             engine: row.get(1),
             auto_increment: row.get(2),
             table_collation: row.get(3),