hannes/packager
1
0
Fork 0
Code Issues 10 Pull Requests Projects Releases Wiki Activity

more migrations

Browse Source
This commit is contained in:
Hannes Körber
2023-08-29 21:34:00 +02:00
parent 1e121a9deb
commit 809615f3b9
3 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rust/src/main.rs
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();
}

9
rust/src/sqlite.rs
View File

@@ -12,7 +12,12 @@ pub async fn init_database_pool(url: &str) -> Result<Pool<Sqlite>, StartError> {
.await?)
}
pub async fn migrate(pool: &Pool<Sqlite>) -> Result<(), StartError> {
sqlx::migrate!().run(pool).await?;
pub async fn migrate(url: &str) -> Result<(), StartError> {
let pool = SqlitePoolOptions::new()
.max_connections(5)
.connect_with(SqliteConnectOptions::from_str(url)?.pragma("foreign_keys", "0"))
.await?;
sqlx::migrate!().run(&pool).await?;
Ok(())
}