test(mysql): fix integration tests

Signed-off-by: Atkins Chang <[email protected]>

Author: AtkinsChang

tests/mysql/macros.rs

@@ -188,12 +188,13 @@ async fn test_column_override_nullable() -> anyhow::Result<()> {
 
 async fn with_test_row<'a>(
     conn: &'a mut MySqlConnection,
-) -> anyhow::Result<Transaction<'a, MySql>> {
+) -> anyhow::Result<(Transaction<'a, MySql>, i64)> {
     let mut transaction = conn.begin().await?;
-    sqlx::query!("INSERT INTO tweet(id, text, owner_id) VALUES (1, '#sqlx is pretty cool!', 1)")
+    let id = sqlx::query!("INSERT INTO tweet(text, owner_id) VALUES ('#sqlx is pretty cool!', 1)")
         .execute(&mut transaction)
-        .await?;
-    Ok(transaction)
+        .await?
+        .last_insert_id();
+    Ok((transaction, id as i64))
 }
 
 #[derive(PartialEq, Eq, Debug, sqlx::Type)]
@@ -211,13 +212,13 @@ struct OptionalRecord {
 #[sqlx_macros::test]
 async fn test_column_override_wildcard() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, id) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query_as!(Record, "select id as `id: _` from tweet")
         .fetch_one(&mut conn)
         .await?;
 
-    assert_eq!(record.id, MyInt(1));
+    assert_eq!(record.id, MyInt(id));
 
     // this syntax is also useful for expressions
     let record = sqlx::query_as!(Record, "select * from (select 1 as `id: _`) records")
@@ -238,7 +239,7 @@ async fn test_column_override_wildcard() -> anyhow::Result<()> {
 #[sqlx_macros::test]
 async fn test_column_override_wildcard_not_null() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, _) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query_as!(Record, "select owner_id as `id!: _` from tweet")
         .fetch_one(&mut conn)
@@ -252,27 +253,27 @@ async fn test_column_override_wildcard_not_null() -> anyhow::Result<()> {
 #[sqlx_macros::test]
 async fn test_column_override_wildcard_nullable() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, id) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query_as!(OptionalRecord, "select id as `id?: _` from tweet")
         .fetch_one(&mut conn)
         .await?;
 
-    assert_eq!(record.id, Some(MyInt(1)));
+    assert_eq!(record.id, Some(MyInt(id)));
 
     Ok(())
 }
 
 #[sqlx_macros::test]
 async fn test_column_override_exact() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, id) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query!("select id as `id: MyInt` from tweet")
         .fetch_one(&mut conn)
         .await?;
 
-    assert_eq!(record.id, MyInt(1));
+    assert_eq!(record.id, MyInt(id));
 
     // we can also support this syntax for expressions
     let record = sqlx::query!("select * from (select 1 as `id: MyInt`) records")
@@ -293,7 +294,7 @@ async fn test_column_override_exact() -> anyhow::Result<()> {
 #[sqlx_macros::test]
 async fn test_column_override_exact_not_null() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, _) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query!("select owner_id as `id!: MyInt` from tweet")
         .fetch_one(&mut conn)
@@ -307,13 +308,13 @@ async fn test_column_override_exact_not_null() -> anyhow::Result<()> {
 #[sqlx_macros::test]
 async fn test_column_override_exact_nullable() -> anyhow::Result<()> {
     let mut conn = new::<MySql>().await?;
-    let mut conn = with_test_row(&mut conn).await?;
+    let (mut conn, id) = with_test_row(&mut conn).await?;
 
     let record = sqlx::query!("select id as `id?: MyInt` from tweet")
         .fetch_one(&mut conn)
         .await?;
 
-    assert_eq!(record.id, Some(MyInt(1)));
+    assert_eq!(record.id, Some(MyInt(id)));
 
     Ok(())
 }