Fix create_db (on startup, for testing, CI)
This commit is contained in:
parent
f3fd25f47a
commit
d07cd79560
1 changed files with 26 additions and 6 deletions
|
@ -166,9 +166,24 @@ async def create_db(drop=False):
|
||||||
async with engine.begin() as conn:
|
async with engine.begin() as conn:
|
||||||
await create_schemas(conn)
|
await create_schemas(conn)
|
||||||
async with engine.begin() as conn:
|
async with engine.begin() as conn:
|
||||||
|
# Import modules to populate the SQLModel metadata
|
||||||
|
from gisaf.models import admin
|
||||||
|
from gisaf.models import authentication
|
||||||
|
from gisaf.models import category
|
||||||
|
from gisaf.models import dashboard
|
||||||
|
from gisaf.models import geo_models_base
|
||||||
|
from gisaf.models import info
|
||||||
|
from gisaf.models import misc
|
||||||
|
from gisaf.models import project
|
||||||
|
from gisaf.models import raw_survey
|
||||||
|
from gisaf.models import reconcile
|
||||||
|
from gisaf.models import survey
|
||||||
|
from gisaf.models import tags
|
||||||
|
|
||||||
if drop:
|
if drop:
|
||||||
await conn.run_sync(SQLModel.metadata.drop_all)
|
await conn.run_sync(SQLModel.metadata.drop_all)
|
||||||
await conn.run_sync(SQLModel.metadata.create_all)
|
resp = await conn.run_sync(SQLModel.metadata.create_all)
|
||||||
|
pass
|
||||||
|
|
||||||
logger.debug(f"Connect to database with config: {conf.db}")
|
logger.debug(f"Connect to database with config: {conf.db}")
|
||||||
while attempts > 0:
|
while attempts > 0:
|
||||||
|
@ -186,9 +201,7 @@ async def create_db(drop=False):
|
||||||
await populate_init_db()
|
await populate_init_db()
|
||||||
return
|
return
|
||||||
else:
|
else:
|
||||||
logger.warning(
|
logger.warning(f"Cannot connect to database after {CREATE_DB_TIMEOUT}, giving up.")
|
||||||
f"Cannot connect to database after {CREATE_DB_TIMEOUT}, giving up."
|
|
||||||
)
|
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
|
@ -196,6 +209,15 @@ async def is_fresh_install() -> bool:
|
||||||
"""Detect is the database is newly created, without data"""
|
"""Detect is the database is newly created, without data"""
|
||||||
from gisaf.models.authentication import User
|
from gisaf.models.authentication import User
|
||||||
|
|
||||||
|
async with engine.begin() as conn:
|
||||||
|
has_table_query = """
|
||||||
|
SELECT count(tablename)
|
||||||
|
FROM pg_catalog.pg_tables
|
||||||
|
WHERE schemaname = 'gisaf_admin' and tablename='user'"""
|
||||||
|
resp = await conn.execute(text(has_table_query))
|
||||||
|
if resp.scalar() == 0:
|
||||||
|
return True
|
||||||
|
|
||||||
async with db_session() as session:
|
async with db_session() as session:
|
||||||
nb_users = (await session.exec(select(func.count(col(User.username))))).one()
|
nb_users = (await session.exec(select(func.count(col(User.username))))).one()
|
||||||
return nb_users == 0
|
return nb_users == 0
|
||||||
|
@ -222,9 +244,7 @@ async def populate_init_db():
|
||||||
from gisaf.models.map_bases import BaseStyle
|
from gisaf.models.map_bases import BaseStyle
|
||||||
|
|
||||||
logger.info("Populating initial database")
|
logger.info("Populating initial database")
|
||||||
|
|
||||||
async with db_session() as session:
|
async with db_session() as session:
|
||||||
|
|
||||||
user = await create_user(
|
user = await create_user(
|
||||||
session=session,
|
session=session,
|
||||||
username="admin",
|
username="admin",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue