chore: rebase + more concise unit tests

Author: joeydewaal

tests/mysql/types.rs

@@ -387,31 +387,19 @@ CREATE TEMPORARY TABLE user_login (
 }
 
 #[sqlx_macros::test]
-async fn test_arc_str() -> anyhow::Result<()> {
+async fn test_arc_str_slice() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
 
     let name: Arc<str> = "Harold".into();
+    let slice: Arc<[u8]> = [5, 0].into();
 
-    let username: Arc<str> = sqlx::query_scalar("SELECT ? AS username")
+    let username: (Arc<str>, Arc<[u8]>) = sqlx::query_as("SELECT ?, ?")
         .bind(&name)
+        .bind(&slice)
         .fetch_one(&mut conn)
         .await?;
 
-    assert!(username == name);
-    Ok(())
-}
-
-#[sqlx_macros::test]
-async fn test_arc_slice() -> anyhow::Result<()> {
-    let mut conn = new::<MySql>().await?;
-
-    let name: Arc<[u8]> = [5, 0].into();
-
-    let username: Arc<[u8]> = sqlx::query_scalar("SELECT ?")
-        .bind(&name)
-        .fetch_one(&mut conn)
-        .await?;
-
-    assert!(username == name);
+    assert!(username.0 == name);
+    assert!(username.1 == slice);
     Ok(())
 }

tests/postgres/types.rs

@@ -704,18 +704,19 @@ async fn test_arc() -> anyhow::Result<()> {
 }
 
 #[sqlx_macros::test]
-async fn test_arc_slice_2() -> anyhow::Result<()> {
+async fn test_arc_str_slice() -> anyhow::Result<()> {
     let mut conn = new::<Postgres>().await?;
 
-    #[derive(FromRow)]
-    struct Nested {
-        inner: Arc<[i32]>,
-    }
+    let name: Arc<str> = "Harold".into();
+    let slice: Arc<[u8]> = [5, 0].into();
 
-    let username: Nested = sqlx::query_as("SELECT ARRAY[1, 2, 3]::INT4[] as inner")
+    let username: (Arc<str>, Arc<[u8]>) = sqlx::query_as("SELECT $1, $2")
+        .bind(&name)
+        .bind(&slice)
         .fetch_one(&mut conn)
         .await?;
 
-    assert!(username.inner.as_ref() == &[1, 2, 3]);
+    assert!(username.0 == name);
+    assert!(username.1 == slice);
     Ok(())
 }

tests/sqlite/types.rs

@@ -253,31 +253,19 @@ CREATE TEMPORARY TABLE user_login (
 }
 
 #[sqlx_macros::test]
-async fn test_arc_str() -> anyhow::Result<()> {
+async fn test_arc_str_slice() -> anyhow::Result<()> {
     let mut conn = new::<Sqlite>().await?;
 
     let name: Arc<str> = "Harold".into();
+    let slice: Arc<[u8]> = [5, 0].into();
 
-    let username: Arc<str> = sqlx::query_scalar("SELECT $1 AS username")
+    let username: (Arc<str>, Arc<[u8]>) = sqlx::query_as("SELECT $1, $2")
         .bind(&name)
+        .bind(&slice)
         .fetch_one(&mut conn)
         .await?;
 
-    assert!(username == name);
-    Ok(())
-}
-
-#[sqlx_macros::test]
-async fn test_arc_slice() -> anyhow::Result<()> {
-    let mut conn = new::<Sqlite>().await?;
-
-    let name: Arc<[u8]> = [5, 0].into();
-
-    let username: Arc<[u8]> = sqlx::query_scalar("SELECT $1")
-        .bind(&name)
-        .fetch_one(&mut conn)
-        .await?;
-
-    assert!(username == name);
+    assert!(username.0 == name);
+    assert!(username.1 == slice);
     Ok(())
 }