Fix migration order: add group limit columns before ORM queries
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
+11
-3
@@ -85,12 +85,20 @@ def create_app(setup_database=True):
|
|||||||
|
|
||||||
if setup_database:
|
if setup_database:
|
||||||
with app.app_context():
|
with app.app_context():
|
||||||
|
from app.bootstrap import (
|
||||||
|
create_first_admin,
|
||||||
|
ensure_default_group,
|
||||||
|
ensure_site_settings,
|
||||||
|
run_schema_migrations,
|
||||||
|
)
|
||||||
|
|
||||||
db.create_all()
|
db.create_all()
|
||||||
|
run_schema_migrations()
|
||||||
|
|
||||||
if os.getenv("SKIP_DB_INIT") != "1":
|
if os.getenv("SKIP_DB_INIT") != "1":
|
||||||
from app.bootstrap import run_database_setup
|
ensure_default_group(app)
|
||||||
|
ensure_site_settings(app)
|
||||||
run_database_setup(app)
|
create_first_admin(app)
|
||||||
|
|
||||||
return app
|
return app
|
||||||
|
|
||||||
|
|||||||
+7
-3
@@ -104,15 +104,19 @@ def ensure_photo_storage_column():
|
|||||||
db.session.commit()
|
db.session.commit()
|
||||||
|
|
||||||
|
|
||||||
def run_database_setup(app):
|
def run_schema_migrations():
|
||||||
ensure_schema()
|
ensure_schema()
|
||||||
ensure_default_group(app)
|
|
||||||
ensure_group_limit_columns()
|
ensure_group_limit_columns()
|
||||||
from app.folders import ensure_folder_schema
|
from app.folders import ensure_folder_schema
|
||||||
|
|
||||||
ensure_folder_schema()
|
ensure_folder_schema()
|
||||||
ensure_site_settings(app)
|
|
||||||
ensure_photo_storage_column()
|
ensure_photo_storage_column()
|
||||||
|
|
||||||
|
|
||||||
|
def run_database_setup(app):
|
||||||
|
run_schema_migrations()
|
||||||
|
ensure_default_group(app)
|
||||||
|
ensure_site_settings(app)
|
||||||
create_first_admin(app)
|
create_first_admin(app)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user