From eaead19e800dd2249622215dafd63295f43140e9 Mon Sep 17 00:00:00 2001
From: Austin Bonander <austin@launchbadge.com>
Date: Tue, 26 Oct 2021 13:45:46 -0700
Subject: [PATCH] fix(test): fix mismatched type error in MySQL type tests
 (#1517)

* fix new warning about trailing semicolon in expression macros

* fix(test): fix mismatched type error in MySQL type tests
---
 sqlx-macros/src/derives/attributes.rs | 2 +-
 sqlx-test/src/lib.rs                  | 3 ++-
 tests/mysql/types.rs                  | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sqlx-macros/src/derives/attributes.rs b/sqlx-macros/src/derives/attributes.rs
index 6face1d9fd..202b6b5a17 100644
--- a/sqlx-macros/src/derives/attributes.rs
+++ b/sqlx-macros/src/derives/attributes.rs
@@ -15,7 +15,7 @@ macro_rules! assert_attribute {
 
 macro_rules! fail {
     ($t:expr, $m:expr) => {
-        return Err(syn::Error::new_spanned($t, $m));
+        return Err(syn::Error::new_spanned($t, $m))
     };
 }
 
diff --git a/sqlx-test/src/lib.rs b/sqlx-test/src/lib.rs
index bd4d090cb7..052e157271 100644
--- a/sqlx-test/src/lib.rs
+++ b/sqlx-test/src/lib.rs
@@ -197,7 +197,8 @@ macro_rules! __test_prepared_type {
 #[macro_export]
 macro_rules! MySql_query_for_test_prepared_type {
     () => {
-        "SELECT {0} <=> ?, {0}, ?"
+        // MySQL 8.0.27 changed `<=>` to return an unsigned integer
+        "SELECT CAST({0} <=> ? AS SIGNED INTEGER), {0}, ?"
     };
 }
 
diff --git a/tests/mysql/types.rs b/tests/mysql/types.rs
index e1c4d9f52b..9bd93e0f1b 100644
--- a/tests/mysql/types.rs
+++ b/tests/mysql/types.rs
@@ -235,7 +235,8 @@ mod json_tests {
 
     test_type!(json<JsonValue>(
         MySql,
-        "SELECT CAST({0} AS BINARY) <=> CAST(? AS BINARY), CAST({0} AS BINARY) as _2, ? as _3",
+        // MySQL 8.0.27 changed `<=>` to return an unsigned integer
+        "SELECT CAST(CAST({0} AS BINARY) <=> CAST(? AS BINARY) AS SIGNED INTEGER), CAST({0} AS BINARY) as _2, ? as _3",
         "'\"Hello, World\"'" == json!("Hello, World"),
         "'\"😎\"'" == json!("😎"),
         "'\"🙋‍♀️\"'" == json!("🙋‍♀️"),
@@ -250,7 +251,8 @@ mod json_tests {
 
     test_type!(json_struct<Json<Friend>>(
         MySql,
-        "SELECT CAST({0} AS BINARY) <=> CAST(? AS BINARY), CAST({0} AS BINARY) as _2, ? as _3",
+        // MySQL 8.0.27 changed `<=>` to return an unsigned integer
+        "SELECT CAST(CAST({0} AS BINARY) <=> CAST(? AS BINARY) AS SIGNED INTEGER), CAST({0} AS BINARY) as _2, ? as _3",
         "\'{\"name\":\"Joe\",\"age\":33}\'" == Json(Friend { name: "Joe".to_string(), age: 33 })
     ));