try to run migrations on db connection in tests

diff --git a/Cargo.lock b/Cargo.lock
index ef39f5fd53b4b94ba71fe17855763036269a4714..7144eac1bcdc5f5ba1c782a8f15f667cc9987b36 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -935,16 +935,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "ctor"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484"
-dependencies = [
- "quote",
- "syn",
-]
-
 [[package]]
 name = "darling"
 version = "0.10.2"
@@ -1809,6 +1799,7 @@ dependencies = [
  "bcrypt",
  "chrono",
  "diesel",
+ "diesel_migrations",
  "lazy_static",
  "lemmy_utils",
  "log",
@@ -1848,7 +1839,6 @@ dependencies = [
  "awc",
  "cargo-husky",
  "chrono",
- "ctor",
  "diesel",
  "diesel_migrations",
  "env_logger",

diff --git a/Cargo.toml b/Cargo.toml
index ad5a6cd52f871787cdd65ddb3d0f9620a4aec988..99d755cc0b2a2b3532778acb9531c3d98983b6f1 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -49,7 +49,6 @@ reqwest = { version = "0.10", features = ["json"] }
 activitystreams = "0.7.0-alpha.4"
 actix-rt = { version = "1.1", default-features = false }
 serde_json = { version = "1.0", features = ["preserve_order"]}
-ctor = "0.1.16"
 
 [dev-dependencies.cargo-husky]
 version = "1"

diff --git a/lemmy_db/Cargo.toml b/lemmy_db/Cargo.toml
index 904b16937ec2becd67de6e3d7a1cc68c12156fba..f85225e09d6832f08571ccae333186d41c772cc9 100644 (file)
--- a/lemmy_db/Cargo.toml
+++ b/lemmy_db/Cargo.toml
@@ -10,6 +10,7 @@ path = "src/lib.rs"
 [dependencies]
 lemmy_utils = { path = "../lemmy_utils" }
 diesel = { version = "1.4", features = ["postgres","chrono","r2d2","64-column-tables","serde_json"] }
+diesel_migrations = "1.4"
 chrono = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0", features = ["preserve_order"]}

diff --git a/lemmy_db/src/lib.rs b/lemmy_db/src/lib.rs
index b90c9416ff9ceb6d658043c8888c448b27502dde..50aaa39a100588a06c89ea1e0a178c3f388740ce 100644 (file)
--- a/lemmy_db/src/lib.rs
+++ b/lemmy_db/src/lib.rs
@@ -4,6 +4,8 @@ extern crate diesel;
 extern crate strum_macros;
 #[macro_use]
 extern crate lazy_static;
+#[macro_use]
+extern crate diesel_migrations;
 
 use chrono::NaiveDateTime;
 use diesel::{result::Error, *};
@@ -214,11 +216,13 @@ lazy_static! {
 }
 
 #[cfg(test)]
-pub mod tests {
+mod tests {
   use super::fuzzy_search;
   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,
@@ -227,7 +231,9 @@ pub 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]

diff --git a/src/main.rs b/src/main.rs
index 77063185f07702fa6d23a9df02f48326bfa52359..c55c3655d586e565718ef200ab8fa8b40369f365 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -92,12 +92,3 @@ async fn main() -> Result<(), LemmyError> {
 
   Ok(())
 }
-
-#[cfg(test)]
-#[ctor::ctor]
-fn init() {
-  use lemmy_db::tests::establish_unpooled_connection;
-  let conn = establish_unpooled_connection();
-  embedded_migrations::run(&conn).unwrap();
-  run_advanced_migrations(&conn).unwrap();
-}