manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Elimina Refinery y Barrel en favor de SeaORM

Browse source 
Se integran las funcionalidades de SeaORM en el funcionamiento de
PageTop para abstraer el uso y acceso a la base de datos.
This commit is contained in:
Manuel Cillero 2022-03-13 00:19:05 +01:00
parent 619b7b73c6
commit 4b5d8ce38a
16 changed files with 150 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/core/global.rs
View file

@ -42,15 +42,9 @@ pub fn modules(cfg: &mut server::web::ServiceConfig) {
}
}
pub fn migrations(db_uri: db::Uri) {
let mut conn = refinery::config::Config::try_from(db_uri).unwrap();
pub fn migrations(dbconn: &db::DbConn) {
for m in MODULES.read().unwrap().iter() {
match m.configure_migrations() {
Some(migrations) => {
migrations.run(&mut conn).expect("Failed to run migrations");
},
_ => {}
};
m.migrations(dbconn).expect("Failed to run migrations");
}
}

5
src/core/module/definition.rs
View file

@ -15,7 +15,8 @@ pub trait Module: Send + Sync {
fn configure_module(&self, cfg: &mut server::web::ServiceConfig) {
}
fn configure_migrations(&self) -> Option<db::Migrations> {
None
#[allow(unused_variables)]
fn migrations(&self, dbconn: &db::DbConn) -> Result<(), db::DbErr> {
Ok(())
}
}

32
src/core/server/app.rs
View file

@ -5,19 +5,8 @@ use crate::core::theme::register_theme;
use crate::core::module::register_module;
use std::io::Error;
use std::sync::RwLock;
use actix_web::middleware::normalize::{NormalizePath, TrailingSlash};
#[cfg(feature = "mysql")]
use sqlx::mysql::MySqlPoolOptions as DbPoolOptions;
#[cfg(feature = "postgres")]
use sqlx::postgres::PgPoolOptions as DbPoolOptions;
static DBCONN: Lazy<RwLock<Option<db::Conn>>> = Lazy::new(|| {
RwLock::new(None)
});
pub struct Application {
server: Server,
}
@ -70,7 +59,7 @@ impl Application {
let db_type = "postgres";
// https://github.com/launchbadge/sqlx/issues/1624
let mut db_uri = db::Uri::parse(format!(
let mut db_uri = db::DbUri::parse(format!(
"{}://{}/{}",
db_type,
&SETTINGS.database.db_host,
@ -82,14 +71,14 @@ impl Application {
db_uri.set_port(Some(SETTINGS.database.db_port)).unwrap();
}
let db_pool = DbPoolOptions::new()
.max_connections(SETTINGS.database.max_pool_size)
.connect(db_uri.as_str())
.await
.expect("Failed to connect to database");
let mut db_options = sea_orm::ConnectOptions::new(db_uri.to_string());
db_options.max_connections(SETTINGS.database.max_pool_size);
let mut dbconn = DBCONN.write().unwrap();
*dbconn = Some(db_pool);
let dbconn = sea_orm::Database::connect::<sea_orm::ConnectOptions>(
db_options.into()
)
.await
.expect("Failed to connect to database");
// Registra los temas predefinidos.
register_theme(&base::theme::aliner::AlinerTheme);
@ -112,13 +101,14 @@ impl Application {
// Run migrations.
trace::info!("Running migrations.");
global::migrations(db_uri);
global::migrations(&dbconn);
// Prepara el servidor web.
let server = server::HttpServer::new(|| {
let server = server::HttpServer::new(move || {
server::App::new()
.wrap(tracing_actix_web::TracingLogger)
.wrap(NormalizePath::new(TrailingSlash::Trim))
.data(dbconn.clone())
.configure(&global::themes)
.configure(&global::modules)
})