From fe4c6d396c162dfe28692fd14b286eee724b352b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 8 Nov 2023 12:45:31 +0100
Subject: [PATCH 1/2] Refactored database backup job to handle missing
 POSTGRES_DB environment variable

---
 app/Jobs/DatabaseBackupJob.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index dc596c65c..c951396b8 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -113,7 +113,11 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($db) {
                         $databasesToBackup = str($db)->after('POSTGRES_DB=')->value();
                     } else {
-                        throw new \Exception('POSTGRES_DB not found');
+                        if ($this->database->postgres_user) {
+                            $databasesToBackup = $this->database->postgres_user;
+                        } else {
+                            $databasesToBackup = 'postgres';
+                        }
                     }
                 } else if ($databaseType === 'standalone-mysql') {
                     $this->container_name = "{$this->database->name}-$serviceUuid";

From dd1ce6ee6ccb4ee93f1bb98ab45713519fdfeee4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 8 Nov 2023 12:45:48 +0100
Subject: [PATCH 2/2] Refactor database backup job to simplify code

---
 app/Jobs/DatabaseBackupJob.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/Jobs/DatabaseBackupJob.php b/app/Jobs/DatabaseBackupJob.php
index c951396b8..f9e947c5a 100644
--- a/app/Jobs/DatabaseBackupJob.php
+++ b/app/Jobs/DatabaseBackupJob.php
@@ -113,11 +113,7 @@ class DatabaseBackupJob implements ShouldQueue, ShouldBeEncrypted
                     if ($db) {
                         $databasesToBackup = str($db)->after('POSTGRES_DB=')->value();
                     } else {
-                        if ($this->database->postgres_user) {
-                            $databasesToBackup = $this->database->postgres_user;
-                        } else {
-                            $databasesToBackup = 'postgres';
-                        }
+                        $databasesToBackup = $this->database->postgres_user;
                     }
                 } else if ($databaseType === 'standalone-mysql') {
                     $this->container_name = "{$this->database->name}-$serviceUuid";