Fix str compatibility check.

launchbadge · Aug 1, 2023 · a977c4f · a977c4f
1 parent bf16b38
commit a977c4f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/sqlx-mysql/src/type_info.rs b/sqlx-mysql/src/type_info.rs
@@ -89,6 +89,21 @@ impl PartialEq<MySqlTypeInfo> for MySqlTypeInfo {
                     == other.flags.contains(ColumnFlags::UNSIGNED);
             }
 
+            // for string types, check that our charset matches
+            ColumnType::VarChar
+            | ColumnType::Blob
+            | ColumnType::TinyBlob
+            | ColumnType::MediumBlob
+            | ColumnType::LongBlob
+            | ColumnType::String
+            | ColumnType::VarString
+            | ColumnType::Enum => {
+                return self.flags.contains(ColumnFlags::BLOB)
+                    == other.flags.contains(ColumnFlags::BLOB)
+                    && self.flags.contains(ColumnFlags::BINARY)
+                        == other.flags.contains(ColumnFlags::BINARY)
+            }
+
             _ => {}
         }
 

diff --git a/sqlx-mysql/src/types/str.rs b/sqlx-mysql/src/types/str.rs
@@ -27,7 +27,8 @@ impl Type<MySql> for str {
                 | ColumnType::String
                 | ColumnType::VarString
                 | ColumnType::Enum
-        )
+        ) && !ty.flags.contains(ColumnFlags::BLOB)
+            && !ty.flags.contains(ColumnFlags::BINARY)
     }
 }