Merge branch 'drone-io-dess' into move_views_to_diesel_drone

[lemmy.git] / lemmy_db / src / lib.rs

diff --git a/lemmy_db/src/lib.rs b/lemmy_db/src/lib.rs
index 387e38a2829471e219e5bee198cbc38703be0f90..4df69ca432fb9da21e4d20a34a2c7afe4a2ebae4 100644 (file)
--- a/lemmy_db/src/lib.rs
+++ b/lemmy_db/src/lib.rs
@@ -4,6 +4,10 @@ extern crate diesel;
 extern crate strum_macros;
 #[macro_use]
 extern crate lazy_static;
+// this is used in tests
+#[allow(unused_imports)]
+#[macro_use]
+extern crate diesel_migrations;
 
 use chrono::NaiveDateTime;
 use diesel::{result::Error, *};
@@ -223,6 +227,8 @@ mod tests {
   use crate::{get_database_url_from_env, is_email_regex};
   use diesel::{Connection, PgConnection};
 
+  embed_migrations!();
+
   pub fn establish_unpooled_connection() -> PgConnection {
     let db_url = match get_database_url_from_env() {
       Ok(url) => url,
@@ -231,7 +237,10 @@ mod tests {
         e
       ),
     };
-    PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url))
+    let conn =
+      PgConnection::establish(&db_url).unwrap_or_else(|_| panic!("Error connecting to {}", db_url));
+    embedded_migrations::run(&conn).unwrap();
+    conn
   }
 
   #[test]