apply database migrations before initializing on-database filesystem

this allows populating the in-database filesystem in migrations
fixes #461

Author: lovasoa

src/filesystem.rs

@@ -145,6 +145,7 @@ pub(crate) struct DbFsQueries {
 
 impl DbFsQueries {
     async fn init(db: &Database) -> anyhow::Result<Self> {
+        log::debug!("Initializing database filesystem queries");
         let db_kind = db.connection.any_kind();
         Ok(Self {
             was_modified: Self::make_was_modified_query(db, db_kind).await?,

src/lib.rs

@@ -38,8 +38,10 @@ pub struct AppState {
 
 impl AppState {
     pub async fn init(config: &AppConfig) -> anyhow::Result<Self> {
-        // Connect to the database
         let db = Database::init(config).await?;
+        Self::init_with_db(config, db).await
+    }
+    pub async fn init_with_db(config: &AppConfig, db: Database) -> anyhow::Result<Self> {
         let all_templates = AllTemplates::init(config)?;
         let mut sql_file_cache = FileCache::new();
         let file_system = FileSystem::init(&config.web_root, &db).await;

src/main.rs

@@ -2,7 +2,8 @@ use std::fmt::Write;
 
 use sqlpage::{
     app_config::{self, AppConfig},
-    webserver, AppState,
+    webserver::{self, Database},
+    AppState,
 };
 
 #[actix_web::main]
@@ -16,8 +17,9 @@ async fn main() {
 
 async fn start() -> anyhow::Result<()> {
     let app_config = app_config::load()?;
-    let state = AppState::init(&app_config).await?;
-    webserver::database::migrations::apply(&app_config, &state.db).await?;
+    let db = Database::init(&app_config).await?;
+    webserver::database::migrations::apply(&app_config, &db).await?;
+    let state = AppState::init_with_db(&app_config, db).await?;
     log::debug!("Starting server...");
     let (r, _) = tokio::join!(
         webserver::http::run_server(&app_config, state),