Merge remote-tracking branch 'origin/split-db-workspace' into move_views_to_diesel_split

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

diff --git a/lemmy_db/src/lib.rs b/lemmy_db/src/lib.rs
index 9afb76191accc0f738fa4355eca1b6ca76189e84..8e3521478dcdf9eacb42149c5c286b9f451d6073 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 diesel::{result::Error, *};
 use regex::Regex;
@@ -217,6 +221,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,
@@ -225,7 +231,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]