Fix the mysql tests

Author: weiznich

src/doctest_setup.rs

@@ -101,49 +101,51 @@ cfg_if::cfg_if! {
         async fn establish_connection() -> AsyncMysqlConnection {
             let mut connection = connection_no_data().await;
 
-            diesel::sql_query("CREATE TABLE users (
+            diesel::sql_query("CREATE TABLE IF NOT EXISTS users (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 name TEXT NOT NULL
             ) CHARACTER SET utf8mb4").execute(&mut connection).await.unwrap();
-            diesel::sql_query("INSERT INTO users (name) VALUES ('Sean'), ('Tess')").execute(&mut connection).await.unwrap();
 
-            diesel::sql_query("CREATE TABLE animals (
+
+            diesel::sql_query("CREATE TABLE IF NOT EXISTS animals (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 species TEXT NOT NULL,
                 legs INTEGER NOT NULL,
                 name TEXT
             ) CHARACTER SET utf8mb4").execute(&mut connection).await.unwrap();
-            diesel::sql_query("INSERT INTO animals (species, legs, name) VALUES
-                               ('dog', 4, 'Jack'),
-                               ('spider', 8, null)").execute(&mut connection).await.unwrap();
 
-            diesel::sql_query("CREATE TABLE posts (
+            diesel::sql_query("CREATE TABLE IF NOT EXISTS posts (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 user_id INTEGER NOT NULL,
                 title TEXT NOT NULL
             ) CHARACTER SET utf8mb4").execute(&mut connection).await.unwrap();
-            diesel::sql_query("INSERT INTO posts (user_id, title) VALUES
-                (1, 'My first post'),
-                (1, 'About Rust'),
-                (2, 'My first post too')").execute(&mut connection).await.unwrap();
 
-            diesel::sql_query("CREATE TABLE comments (
+            diesel::sql_query("CREATE TABLE IF NOT EXISTS comments (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 post_id INTEGER NOT NULL,
                 body TEXT NOT NULL
             ) CHARACTER SET utf8mb4").execute(&mut connection).await.unwrap();
-            diesel::sql_query("INSERT INTO comments (post_id, body) VALUES
-                (1, 'Great post'),
-                (2, 'Yay! I am learning Rust'),
-                (3, 'I enjoyed your post')").execute(&mut connection).await.unwrap();
-
-            diesel::sql_query("CREATE TABLE brands (
+            diesel::sql_query("CREATE TABLE IF NOT EXISTS brands (
                 id INTEGER PRIMARY KEY AUTO_INCREMENT,
                 color VARCHAR(255) NOT NULL DEFAULT 'Green',
                 accent VARCHAR(255) DEFAULT 'Blue'
             )").execute(&mut connection).await.unwrap();
 
             connection.begin_test_transaction().await.unwrap();
+            diesel::sql_query("INSERT INTO users (name) VALUES ('Sean'), ('Tess')").execute(&mut connection).await.unwrap();
+            diesel::sql_query("INSERT INTO posts (user_id, title) VALUES
+                (1, 'My first post'),
+                (1, 'About Rust'),
+                (2, 'My first post too')").execute(&mut connection).await.unwrap();
+            diesel::sql_query("INSERT INTO comments (post_id, body) VALUES
+                (1, 'Great post'),
+                (2, 'Yay! I am learning Rust'),
+                (3, 'I enjoyed your post')").execute(&mut connection).await.unwrap();
+            diesel::sql_query("INSERT INTO animals (species, legs, name) VALUES
+                               ('dog', 4, 'Jack'),
+                               ('spider', 8, null)").execute(&mut connection).await.unwrap();
+
+
             connection
         }
     } else {

tests/lib.rs

@@ -1,6 +1,7 @@
 use diesel::prelude::{ExpressionMethods, OptionalExtension, QueryDsl};
 use diesel::QueryResult;
 use diesel_async::*;
+use futures::FutureExt;
 use std::fmt::Debug;
 use std::pin::Pin;
 
@@ -19,12 +20,32 @@ async fn transaction_test(conn: &mut TestConnection) -> QueryResult<()> {
                 let user: Option<User> = users::table.find(42).first(conn).await.optional()?;
                 assert_eq!(user, None::<User>);
 
+                let res = conn
+                    .transaction::<_, _, diesel::result::Error>(|conn| {
+                        async move {
+                            diesel::insert_into(users::table)
+                                .values(users::name.eq("Dave"))
+                                .execute(conn)
+                                .await?;
+                            let count = users::table.count().get_result::<i64>(conn).await?;
+                            assert_eq!(count, 3);
+                            Ok(())
+                        }
+                        .boxed()
+                    })
+                    .await;
+                assert!(res.is_ok());
+                let count = users::table.count().get_result::<i64>(conn).await?;
+                assert_eq!(count, 3);
+
                 let res = diesel::insert_into(users::table)
                     .values(users::name.eq("Eve"))
                     .execute(conn)
                     .await?;
 
                 assert_eq!(res, 1, "Insert in transaction returned wrong result");
+                let count = users::table.count().get_result::<i64>(conn).await?;
+                assert_eq!(count, 4);
 
                 Err(diesel::result::Error::RollbackTransaction)
             }) as Pin<Box<_>>
@@ -106,7 +127,16 @@ async fn setup(connection: &mut TestConnection) {
 async fn connection() -> TestConnection {
     let db_url = std::env::var("DATABASE_URL").unwrap();
     let mut conn = TestConnection::establish(&db_url).await.unwrap();
-    conn.begin_test_transaction().await.unwrap();
+    if cfg!(feature = "postgres") {
+        // postgres allows to modify the schema inside of a transaction
+        conn.begin_test_transaction().await.unwrap();
+    }
     setup(&mut conn).await;
+    if cfg!(feature = "mysql") {
+        // mysql does not allow this and does even automatically close
+        // any open transaction. As of this we open a transaction **after**
+        // we setup the schema
+        conn.begin_test_transaction().await.unwrap();
+    }
     conn
 }