Merge pull request #1105 from erikdarlingdata/feature/code-review-installer

Fix CLI installer version-detection / failure-handling (chunk 4)

Author: erikdarlingdata

Installer.Core/InstallationService.cs

@@ -830,6 +830,7 @@ public static string GenerateSummaryReport(
     public static async Task<string?> GetInstalledVersionAsync(
         string connectionString,
         IProgress<InstallationProgress>? progress = null,
+        bool throwOnError = false,
         CancellationToken cancellationToken = default)
     {
         LogDebug(progress, "GetInstalledVersionAsync: checking for existing installation");
@@ -890,11 +891,17 @@ rather than treating this as a fresh install (which would drop the database).
         catch (SqlException ex)
         {
             LogDebug(progress, $"GetInstalledVersionAsync: SqlException — {ex.Number}: {ex.Message}");
+            /* The installer passes throwOnError=true so a transient/permission error can't be
+               mistaken for "database absent" and silently trigger a fresh install over an
+               existing database (no upgrades, then logged as SUCCESS — the #538 hazard). Soft
+               callers (Dashboard version column, adversarial tests) keep the null fallback. */
+            if (throwOnError) throw;
             return null;
         }
         catch (Exception ex)
         {
             LogDebug(progress, $"GetInstalledVersionAsync: {ex.GetType().Name} — {ex.Message}");
+            if (throwOnError) throw;
             return null;
         }
     }
@@ -1047,6 +1054,14 @@ rather than treating this as a fresh install (which would drop the database).
 
             totalSuccessCount += success;
             totalFailureCount += failure;
+
+            /* Stop at the first failed hop. Later hops assume this one's schema changes applied;
+               running them against a partially-upgraded database compounds the damage. The caller
+               aborts the whole install when totalFailureCount > 0. */
+            if (failure > 0)
+            {
+                break;
+            }
         }
 
         return (totalSuccessCount, totalFailureCount, upgrades.Count);

Installer.Core/Models/InstallationResultCode.cs

@@ -14,5 +14,6 @@ public enum InstallationResultCode
     VersionCheckFailed = 5,
     SqlFilesNotFound = 6,
     UninstallFailed = 7,
-    UpgradesFailed = 8
+    UpgradesFailed = 8,
+    CleanInstallFailed = 9
 }

Installer/Program.cs

@@ -533,8 +533,22 @@ Ask about clean install (automated mode preserves database unless --reinstall fl
                 }
                 catch (Exception ex)
                 {
-                    Console.WriteLine($"Warning: Could not complete cleanup: {ex.Message}");
-                    Console.WriteLine("Continuing with installation...");
+                    Console.WriteLine();
+                    Console.WriteLine("================================================================================");
+                    WriteError($"Clean install failed: {ex.Message}");
+                    Console.WriteLine("The database was NOT dropped/reset, so continuing would install over an");
+                    Console.WriteLine("inconsistent database with neither a clean drop nor upgrade scripts. Aborting.");
+                    Console.WriteLine("Fix the error above and re-run the installer.");
+                    Console.WriteLine("================================================================================");
+
+                    string errorLogPath = WriteErrorLog(ex, serverName!, infoVersion);
+                    Console.WriteLine($"Error log written to: {errorLogPath}");
+
+                    if (!automatedMode)
+                    {
+                        WaitForExit();
+                    }
+                    return (int)InstallationResultCode.CleanInstallFailed;
                 }
             }
             else
@@ -545,7 +559,7 @@ Ask about clean install (automated mode preserves database unless --reinstall fl
                 string? currentVersion = null;
                 try
                 {
-                    currentVersion = await InstallationService.GetInstalledVersionAsync(connectionString).ConfigureAwait(false);
+                    currentVersion = await InstallationService.GetInstalledVersionAsync(connectionString, throwOnError: true).ConfigureAwait(false);
                 }
                 catch (Exception ex)
                 {