From bdc71f1218066898a9d0dac71dbf50890b9dd20c Mon Sep 17 00:00:00 2001 From: Raphael Paul Laude Date: Sat, 20 Jul 2024 19:38:43 -0400 Subject: [PATCH] just do it the old way --- backend/app/core/config.py | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/backend/app/core/config.py b/backend/app/core/config.py index 12c11669..6912b178 100644 --- a/backend/app/core/config.py +++ b/backend/app/core/config.py @@ -52,30 +52,18 @@ def server_host(self) -> str: # Postgres POSTGRES_SCHEME: str - POSTGRES_SERVER: str | None - POSTGRES_PORT: int | None = 5432 - POSTGRES_USER: str | None - POSTGRES_PASSWORD: str | None - POSTGRES_DB: str = "" - DATABASE_URL: str | None = None + POSTGRES_SERVER: str + POSTGRES_PORT: int = 5432 + POSTGRES_USER: str + POSTGRES_PASSWORD: str + POSTGRES_DB: str + DATABASE_URL: str @computed_field # type: ignore[misc] @property def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn: if self.DATABASE_URL: - db_uri = MultiHostUrl(self.DATABASE_URL) - (host,) = db_uri.hosts() - - self.POSTGRES_SCHEME = db_uri.scheme - self.POSTGRES_PORT = host["port"] - self.POSTGRES_USER = host["username"] - self.POSTGRES_PASSWORD = host["password"] - self.POSTGRES_SERVER = host["host"] - - if db_uri.path: - self.POSTGRES_DB = db_uri.path.lstrip("/") - - return db_uri + return MultiHostUrl(self.DATABASE_URL) return MultiHostUrl.build( scheme=self.POSTGRES_SCHEME,