From 49abcc20b4036eb87cd04da74887fdfe3afd73f8 Mon Sep 17 00:00:00 2001 From: test2 Date: Sat, 6 Jun 2026 23:03:54 +0300 Subject: [PATCH] Fix migration order: add group limit columns before ORM queries Co-authored-by: Cursor --- app/__init__.py | 14 +++++++++++--- app/bootstrap.py | 10 +++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 4106c68..4a79df3 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -85,12 +85,20 @@ def create_app(setup_database=True): if setup_database: with app.app_context(): + from app.bootstrap import ( + create_first_admin, + ensure_default_group, + ensure_site_settings, + run_schema_migrations, + ) + db.create_all() + run_schema_migrations() if os.getenv("SKIP_DB_INIT") != "1": - from app.bootstrap import run_database_setup - - run_database_setup(app) + ensure_default_group(app) + ensure_site_settings(app) + create_first_admin(app) return app diff --git a/app/bootstrap.py b/app/bootstrap.py index 7f53225..8c3f05c 100644 --- a/app/bootstrap.py +++ b/app/bootstrap.py @@ -104,15 +104,19 @@ def ensure_photo_storage_column(): db.session.commit() -def run_database_setup(app): +def run_schema_migrations(): ensure_schema() - ensure_default_group(app) ensure_group_limit_columns() from app.folders import ensure_folder_schema ensure_folder_schema() - ensure_site_settings(app) ensure_photo_storage_column() + + +def run_database_setup(app): + run_schema_migrations() + ensure_default_group(app) + ensure_site_settings(app) create_first_admin(app)