mirror of https://github.com/realaravinth/gitpad
chore: use crata::db::* to init DB connection in tests
parent
3fca4a4f99
commit
4a8b72c7d5
19
src/db.rs
19
src/db.rs
|
@ -25,9 +25,9 @@ pub mod pg {
|
||||||
use db_sqlx_postgres::{ConnectionOptions, Fresh};
|
use db_sqlx_postgres::{ConnectionOptions, Fresh};
|
||||||
use sqlx::postgres::PgPoolOptions;
|
use sqlx::postgres::PgPoolOptions;
|
||||||
|
|
||||||
pub async fn get_data(pool: Option<u32>) -> BoxDB {
|
pub async fn get_data(settings: Option<Settings>) -> BoxDB {
|
||||||
let settings = Settings::new().unwrap();
|
let settings = settings.unwrap_or_else(|| Settings::new().unwrap());
|
||||||
let pool = pool.unwrap_or(settings.database.pool);
|
let pool = settings.database.pool;
|
||||||
let pool_options = PgPoolOptions::new().max_connections(pool);
|
let pool_options = PgPoolOptions::new().max_connections(pool);
|
||||||
let connection_options = ConnectionOptions::Fresh(Fresh {
|
let connection_options = ConnectionOptions::Fresh(Fresh {
|
||||||
pool_options,
|
pool_options,
|
||||||
|
@ -35,9 +35,7 @@ pub mod pg {
|
||||||
});
|
});
|
||||||
let db = connection_options.connect().await.unwrap();
|
let db = connection_options.connect().await.unwrap();
|
||||||
db.migrate().await.unwrap();
|
db.migrate().await.unwrap();
|
||||||
let db = Box::new(db);
|
Box::new(db)
|
||||||
|
|
||||||
db
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,10 +44,10 @@ pub mod sqlite {
|
||||||
use db_sqlx_sqlite::{ConnectionOptions, Fresh};
|
use db_sqlx_sqlite::{ConnectionOptions, Fresh};
|
||||||
use sqlx::sqlite::SqlitePoolOptions;
|
use sqlx::sqlite::SqlitePoolOptions;
|
||||||
|
|
||||||
pub async fn get_data(pool: Option<u32>) -> BoxDB {
|
pub async fn get_data(settings: Option<Settings>) -> BoxDB {
|
||||||
let settings = Settings::new().unwrap();
|
let settings = settings.unwrap_or_else(|| Settings::new().unwrap());
|
||||||
|
|
||||||
let pool = pool.unwrap_or(settings.database.pool);
|
let pool = settings.database.pool;
|
||||||
let pool_options = SqlitePoolOptions::new().max_connections(pool);
|
let pool_options = SqlitePoolOptions::new().max_connections(pool);
|
||||||
let connection_options = ConnectionOptions::Fresh(Fresh {
|
let connection_options = ConnectionOptions::Fresh(Fresh {
|
||||||
pool_options,
|
pool_options,
|
||||||
|
@ -58,7 +56,6 @@ pub mod sqlite {
|
||||||
|
|
||||||
let db = connection_options.connect().await.unwrap();
|
let db = connection_options.connect().await.unwrap();
|
||||||
db.migrate().await.unwrap();
|
db.migrate().await.unwrap();
|
||||||
let db = Box::new(db);
|
Box::new(db)
|
||||||
db
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,8 +71,8 @@ async fn main() -> std::io::Result<()> {
|
||||||
|
|
||||||
log::info!("DB type: {}", settings.database.database_type);
|
log::info!("DB type: {}", settings.database.database_type);
|
||||||
let db = match settings.database.database_type {
|
let db = match settings.database.database_type {
|
||||||
settings::DBType::Sqlite => db::sqlite::get_data(None).await,
|
settings::DBType::Sqlite => db::sqlite::get_data(Some(settings.clone())).await,
|
||||||
settings::DBType::Postgres => db::pg::get_data(None).await,
|
settings::DBType::Postgres => db::pg::get_data(Some(settings.clone())).await,
|
||||||
};
|
};
|
||||||
let db = WebData::new(db);
|
let db = WebData::new(db);
|
||||||
|
|
||||||
|
|
20
src/tests.rs
20
src/tests.rs
|
@ -32,45 +32,33 @@ use crate::api::v1::ROUTES;
|
||||||
use crate::data::api::v1::auth::{Login, Register};
|
use crate::data::api::v1::auth::{Login, Register};
|
||||||
use crate::data::Data;
|
use crate::data::Data;
|
||||||
pub use crate::db::BoxDB;
|
pub use crate::db::BoxDB;
|
||||||
|
use crate::db::{pg, sqlite};
|
||||||
use crate::errors::*;
|
use crate::errors::*;
|
||||||
use crate::settings::DBType;
|
use crate::settings::DBType;
|
||||||
use crate::*;
|
use crate::*;
|
||||||
use db_core::prelude::*;
|
|
||||||
|
|
||||||
pub mod sqlx_postgres {
|
pub mod sqlx_postgres {
|
||||||
use super::*;
|
use super::*;
|
||||||
use db_sqlx_postgres::{ConnectionOptions, Fresh};
|
|
||||||
use sqlx::postgres::PgPoolOptions;
|
|
||||||
|
|
||||||
pub async fn get_data() -> (BoxDB, Arc<Data>) {
|
pub async fn get_data() -> (BoxDB, Arc<Data>) {
|
||||||
let url = env::var("POSTGRES_DATABASE_URL").unwrap();
|
let url = env::var("POSTGRES_DATABASE_URL").unwrap();
|
||||||
let mut settings = Settings::new().unwrap();
|
let mut settings = Settings::new().unwrap();
|
||||||
settings.database.url = url.clone();
|
settings.database.url = url.clone();
|
||||||
settings.database.database_type = DBType::Postgres;
|
settings.database.database_type = DBType::Postgres;
|
||||||
let pool_options = PgPoolOptions::new().max_connections(2);
|
let db = pg::get_data(Some(settings.clone())).await;
|
||||||
let connection_options = ConnectionOptions::Fresh(Fresh { pool_options, url });
|
|
||||||
|
|
||||||
let db = Box::new(connection_options.connect().await.unwrap());
|
|
||||||
|
|
||||||
(db, Data::new(Some(settings)))
|
(db, Data::new(Some(settings)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub mod sqlx_sqlite {
|
pub mod sqlx_sqlite {
|
||||||
use super::*;
|
use super::*;
|
||||||
use db_sqlx_sqlite::{ConnectionOptions, Fresh};
|
|
||||||
use sqlx::sqlite::SqlitePoolOptions;
|
|
||||||
|
|
||||||
pub async fn get_data() -> (BoxDB, Arc<Data>) {
|
pub async fn get_data() -> (BoxDB, Arc<Data>) {
|
||||||
let url = env::var("SQLITE_DATABASE_URL").unwrap();
|
let url = env::var("SQLITE_DATABASE_URL").unwrap();
|
||||||
let mut settings = Settings::new().unwrap();
|
let mut settings = Settings::new().unwrap();
|
||||||
settings.database.url = url.clone();
|
settings.database.url = url.clone();
|
||||||
settings.database.database_type = DBType::Sqlite;
|
settings.database.database_type = DBType::Sqlite;
|
||||||
|
let db = sqlite::get_data(Some(settings.clone())).await;
|
||||||
let pool_options = SqlitePoolOptions::new().max_connections(2);
|
|
||||||
let connection_options = ConnectionOptions::Fresh(Fresh { pool_options, url });
|
|
||||||
|
|
||||||
let db = Box::new(connection_options.connect().await.unwrap());
|
|
||||||
(db, Data::new(Some(settings)))
|
(db, Data::new(Some(settings)))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -155,7 +143,7 @@ impl Data {
|
||||||
password: &str,
|
password: &str,
|
||||||
) -> (Login, ServiceResponse<EitherBody<BoxBody>>) {
|
) -> (Login, ServiceResponse<EitherBody<BoxBody>>) {
|
||||||
self.register_test(db, name, email, password).await;
|
self.register_test(db, name, email, password).await;
|
||||||
self.signin_test(&db, name, password).await
|
self.signin_test(db, name, password).await
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn to_arc(&self) -> Arc<Self> {
|
pub fn to_arc(&self) -> Arc<Self> {
|
||||||
|
|
Loading…
Reference in New Issue