more migrations

This commit is contained in:
2023-08-29 21:34:00 +02:00
parent 1e121a9deb
commit 809615f3b9
3 changed files with 44 additions and 12 deletions

View File

@@ -82,15 +82,15 @@ async fn main() -> MainResult {
.with_max_level(tracing::Level::DEBUG)
.init();
if let Err(e) = sqlite::migrate(&args.database_url).await {
return <_ as Into<Error>>::into(e).into();
}
let database_pool = match sqlite::init_database_pool(&args.database_url).await {
Ok(pool) => pool,
Err(e) => return <_ as Into<Error>>::into(e).into(),
};
if let Err(e) = sqlite::migrate(&database_pool).await {
return <_ as Into<Error>>::into(e).into();
}
let state = AppState {
database_pool,
client_state: ClientState::new(),
@@ -159,12 +159,7 @@ async fn main() -> MainResult {
},
},
Command::Migrate => {
let database_pool = match sqlite::init_database_pool(&args.database_url).await {
Ok(pool) => pool,
Err(e) => return <_ as Into<Error>>::into(e).into(),
};
if let Err(e) = sqlite::migrate(&database_pool).await {
if let Err(e) = sqlite::migrate(&args.database_url).await {
return <_ as Into<Error>>::into(e).into();
}