Hostea
/
gitpad
mirror of https://github.com/realaravinth/gitpad
4
0
Fork 0
Code Issues 3 Projects Releases Wiki Activity

chore: use crata::db::* to init DB connection in tests

master
Aravinth Manivannan 2022-02-19 13:15:08 +05:30
parent 3fca4a4f99
commit 4a8b72c7d5
Signed by: realaravinth
GPG Key ID: AD9F0F08E855ED88
3 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/db.rs
View File

@ -25,9 +25,9 @@ pub mod pg {
use db_sqlx_postgres::{ConnectionOptions, Fresh};
use sqlx::postgres::PgPoolOptions;
pub async fn get_data(pool: Option<u32>) -> BoxDB {
let settings = Settings::new().unwrap();
let pool = pool.unwrap_or(settings.database.pool);
pub async fn get_data(settings: Option<Settings>) -> BoxDB {
let settings = settings.unwrap_or_else(|| Settings::new().unwrap());
let pool = settings.database.pool;
let pool_options = PgPoolOptions::new().max_connections(pool);
let connection_options = ConnectionOptions::Fresh(Fresh {
pool_options,
@ -35,9 +35,7 @@ pub mod pg {
});
let db = connection_options.connect().await.unwrap();
db.migrate().await.unwrap();
let db = Box::new(db);
db
Box::new(db)
}
}
@ -46,10 +44,10 @@ pub mod sqlite {
use db_sqlx_sqlite::{ConnectionOptions, Fresh};
use sqlx::sqlite::SqlitePoolOptions;
pub async fn get_data(pool: Option<u32>) -> BoxDB {
let settings = Settings::new().unwrap();
pub async fn get_data(settings: Option<Settings>) -> BoxDB {
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 connection_options = ConnectionOptions::Fresh(Fresh {
pool_options,
@ -58,7 +56,6 @@ pub mod sqlite {
let db = connection_options.connect().await.unwrap();
db.migrate().await.unwrap();
let db = Box::new(db);
db
Box::new(db)
}
}

4
src/main.rs
View File

@ -71,8 +71,8 @@ async fn main() -> std::io::Result<()> {
log::info!("DB type: {}", settings.database.database_type);
let db = match settings.database.database_type {
settings::DBType::Sqlite => db::sqlite::get_data(None).await,
settings::DBType::Postgres => db::pg::get_data(None).await,
settings::DBType::Sqlite => db::sqlite::get_data(Some(settings.clone())).await,
settings::DBType::Postgres => db::pg::get_data(Some(settings.clone())).await,
};
let db = WebData::new(db);

20
src/tests.rs
View File

@ -32,45 +32,33 @@ use crate::api::v1::ROUTES;
use crate::data::api::v1::auth::{Login, Register};
use crate::data::Data;
pub use crate::db::BoxDB;
use crate::db::{pg, sqlite};
use crate::errors::*;
use crate::settings::DBType;
use crate::*;
use db_core::prelude::*;
pub mod sqlx_postgres {
use super::*;
use db_sqlx_postgres::{ConnectionOptions, Fresh};
use sqlx::postgres::PgPoolOptions;
pub async fn get_data() -> (BoxDB, Arc<Data>) {
let url = env::var("POSTGRES_DATABASE_URL").unwrap();
let mut settings = Settings::new().unwrap();
settings.database.url = url.clone();
settings.database.database_type = DBType::Postgres;
let pool_options = PgPoolOptions::new().max_connections(2);
let connection_options = ConnectionOptions::Fresh(Fresh { pool_options, url });
let db = Box::new(connection_options.connect().await.unwrap());
let db = pg::get_data(Some(settings.clone())).await;
(db, Data::new(Some(settings)))
}
}
pub mod sqlx_sqlite {
use super::*;
use db_sqlx_sqlite::{ConnectionOptions, Fresh};
use sqlx::sqlite::SqlitePoolOptions;
pub async fn get_data() -> (BoxDB, Arc<Data>) {
let url = env::var("SQLITE_DATABASE_URL").unwrap();
let mut settings = Settings::new().unwrap();
settings.database.url = url.clone();
settings.database.database_type = DBType::Sqlite;
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());
let db = sqlite::get_data(Some(settings.clone())).await;
(db, Data::new(Some(settings)))
}
}
@ -155,7 +143,7 @@ impl Data {
password: &str,
) -> (Login, ServiceResponse<EitherBody<BoxBody>>) {
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> {