Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix potential DB migration issues

Browse source
This commit is contained in:
Théophile Diot 2024-03-13 13:36:00 +00:00
parent c5e39a33b0
commit cef03c6281
No known key found for this signature in database
GPG key ID: 248FEA4BAE400D06
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/common/db/Database.py
View file

@ -96,7 +96,7 @@ class Database:
elif match.group("database").startswith("m") and not match.group("database").endswith("+pymysql"):
sqlalchemy_string = sqlalchemy_string.replace(
match.group("database"), f"{match.group('database')}+pymysql"
) # ? This is mandatory for alemic to work with mariadb and mysql
) # ? This is strongly recommended as pymysql is the new way to connect to mariadb and mysql
elif match.group("database").startswith("postgresql") and not match.group("database").endswith("+psycopg"):
sqlalchemy_string = sqlalchemy_string.replace(
match.group("database"), f"{match.group('database')}+psycopg"
@ -317,10 +317,11 @@ class Database:
"pro_overlapped": False,
"pro_status": "invalid",
"last_pro_check": None,
"default": True,
}
database = self.database_uri.split(":")[0].split("+")[0]
with self.__db_session() as session:
with suppress(ProgrammingError, OperationalError):
try:
data["database_version"] = (
session.execute(text("SELECT sqlite_version()" if database == "sqlite" else "SELECT VERSION()")).first() or ["unknown"]
)[0]
@ -350,8 +351,11 @@ class Database:
"pro_overlapped": metadata.pro_overlapped,
"pro_status": metadata.pro_status,
"last_pro_check": metadata.last_pro_check,
"default": False,
}
)
except (ProgrammingError, OperationalError):
self.logger.debug(f"Can't get the metadata: {format_exc()}")
return data
@ -426,7 +430,10 @@ class Database:
old_data = {}
if inspector and len(inspector.get_table_names()):
db_version = self.get_metadata()["version"]
metadata = self.get_metadata()
db_version = metadata["version"]
if metadata["default"]:
db_version = "error"
if db_version != bunkerweb_version:
self.logger.warning(f"Database version ({db_version}) is different from Bunkerweb version ({bunkerweb_version}), migrating ...")