From 31655536b1b882aba5b11802f0ef945758c3e215 Mon Sep 17 00:00:00 2001
From: Nikolaj Geisle <70372949+Zeegaan@users.noreply.github.com>
Date: Mon, 9 Jan 2023 08:52:46 +0100
Subject: [PATCH] Implement check for connectionstring value (#13641)

Signed-off-by: Zeegaan <nge@umbraco.dk>

Signed-off-by: Zeegaan <nge@umbraco.dk>
Co-authored-by: Zeegaan <nge@umbraco.dk>
---
 .../Install/InstallSteps/DatabaseConfigureStep.cs          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs
index 8d2886c223..a988a5f475 100644
--- a/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs
+++ b/src/Umbraco.Infrastructure/Install/InstallSteps/DatabaseConfigureStep.cs
@@ -36,7 +36,12 @@ public class DatabaseConfigureStep : InstallSetupStep<DatabaseModel>
 
     public override Task<InstallSetupResult?> ExecuteAsync(DatabaseModel databaseSettings)
     {
-        if (!_databaseBuilder.ConfigureDatabaseConnection(databaseSettings, false))
+        if (databaseSettings is null && string.IsNullOrWhiteSpace(_connectionStrings.CurrentValue.ConnectionString) is false)
+        {
+            return Task.FromResult<InstallSetupResult?>(null);
+        }
+
+        if (!_databaseBuilder.ConfigureDatabaseConnection(databaseSettings!, false))
         {
             throw new InstallException("Could not connect to the database");
         }