Merge pull request #134 from uktrade/database-config-test

Attempt at database config change
uktrade · Dec 13, 2024 · 373d9ae · 373d9ae
2 parents 4ed15d2 + 6e24b7f
commit 373d9ae
Showing 1 changed file with 29 additions and 17 deletions.
diff --git a/fbr/settings.py b/fbr/settings.py
@@ -111,7 +111,7 @@
 
 WSGI_APPLICATION = "fbr.wsgi.application"
 
-DATABASES: dict = {}
+DATABASES: dict = {"default": {}}
 
 # We're going to restructure the below so that we don't end up with
 # a sqlite database in production.
@@ -121,23 +121,35 @@
 #     default=database_url_from_env("DATABASE_CREDENTIALS")
 # )
 
-if DATABASE_URL := env("DATABASE_URL", default=None):
-    DATABASES = {
-        "default": {
-            **dj_database_url.parse(
-                DATABASE_URL,
-                engine="postgresql",
-            ),
-            "ENGINE": "django.db.backends.postgresql",
-        }
-    }
+# if DATABASE_URL := env("DATABASE_URL", default=None):
+#     DATABASES = {
+#         "default": {
+#             **dj_database_url.parse(
+#                 DATABASE_URL,
+#                 engine="postgresql",
+#             ),
+#             "ENGINE": "django.db.backends.postgresql",
+#         }
+#     }
+# else:
+#     DATABASES = {
+#         "default": {
+#             "ENGINE": "django.db.backends.sqlite3",
+#             "NAME": BASE_DIR / "db.sqlite3",
+#         }
+#     }
+
+if DATABASE_URL := env("DATABASE_CREDENTIALS", default=None):
+    DATABASES["default"] = dj_database_url.config(
+        default=database_url_from_env("DATABASE_CREDENTIALS")
+    )
+    DATABASES["default"]["ENGINE"] = "django.db.backends.postgresql"
 else:
-    DATABASES = {
-        "default": {
-            "ENGINE": "django.db.backends.sqlite3",
-            "NAME": BASE_DIR / "db.sqlite3",
-        }
-    }
+    DATABASES["default"] = dj_database_url.parse(
+        "",
+        engine="postgresql",
+    )
+    DATABASES["default"]["ENGINE"] = "django.db.backends.postgresql"
 
 
 AUTH_PASSWORD_VALIDATORS = [