From e34f76b3bb585b7039837f0f7e25d5227d79865e Mon Sep 17 00:00:00 2001
From: Daniel Harvey <the.real.daniel.harvey@gmail.com>
Date: Mon, 18 May 2026 22:39:20 -0400
Subject: [PATCH] fix(data): load connection string from connections.json;
 correct HasIndex comment

---
 .../Data/Configurations/TrackConfiguration.cs |  6 ++---
 DeepDrftData/Data/DeepDrftContextFactory.cs   | 24 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/DeepDrftData/Data/Configurations/TrackConfiguration.cs b/DeepDrftData/Data/Configurations/TrackConfiguration.cs
index 9da506b..1075da7 100644
--- a/DeepDrftData/Data/Configurations/TrackConfiguration.cs
+++ b/DeepDrftData/Data/Configurations/TrackConfiguration.cs
@@ -53,9 +53,9 @@ public class TrackConfiguration : BaseEntityConfiguration<TrackEntity>
         builder.Property(e => e.CreatedByUserId)
             .HasColumnName("created_by_user_id");
 
-        // Explicit index on is_deleted so soft-delete global query filters are
-        // not full table scans. base.Configure may or may not add this depending
-        // on the BlazorBlocks.Data version; declaring it here guarantees it.
+        // Names the is_deleted index explicitly. BaseEntityConfiguration.Configure already
+        // calls HasIndex(e => e.IsDeleted); this adds HasDatabaseName so EF always uses
+        // "IX_track_is_deleted" regardless of auto-naming conventions.
         builder.HasIndex(e => e.IsDeleted).HasDatabaseName("IX_track_is_deleted");
     }
 }
diff --git a/DeepDrftData/Data/DeepDrftContextFactory.cs b/DeepDrftData/Data/DeepDrftContextFactory.cs
index 3d417b7..f532c77 100644
--- a/DeepDrftData/Data/DeepDrftContextFactory.cs
+++ b/DeepDrftData/Data/DeepDrftContextFactory.cs
@@ -7,16 +7,26 @@ public class DeepDrftContextFactory : IDesignTimeDbContextFactory<DeepDrftContex
 {
     public DeepDrftContext CreateDbContext(string[] args)
     {
-        // For 'dotnet ef' commands, set ConnectionStrings__DefaultConnection in your environment when
-        // you need to actually hit the database (e.g. `dotnet ef database update`). For model-only
-        // operations like `migrations add`, the placeholder below is sufficient — EF never connects.
-        // Example: export ConnectionStrings__DefaultConnection="Host=localhost;Port=5433;Database=postgres;Username=postgres;Password=yourpassword"
-        var connectionString = Environment.GetEnvironmentVariable("ConnectionStrings__DefaultConnection")
-            ?? "Host=localhost;Port=5433;Database=postgres;Username=postgres;Password=placeholder";
+        // Load the real connection string from environment/connections.json — the same
+        // file DeepDrftWeb's Program.cs loads via CredentialTools. When EF tools run with
+        // --startup-project DeepDrftWeb, the working directory resolves there, so this
+        // relative path works without any env var configuration.
+        const string relPath = "environment/connections.json";
+        if (!File.Exists(relPath))
+            throw new FileNotFoundException(
+                $"'{relPath}' not found. Run EF commands with --startup-project DeepDrftWeb " +
+                $"from the solution root (current dir: {Directory.GetCurrentDirectory()}).", relPath);
+
+        using var doc = System.Text.Json.JsonDocument.Parse(File.ReadAllText(relPath));
+        var connectionString = doc.RootElement
+            .GetProperty("ConnectionStrings")
+            .GetProperty("DefaultConnection")
+            .GetString()
+            ?? throw new InvalidOperationException(
+                "ConnectionStrings:DefaultConnection not found in environment/connections.json");
 
         var optionsBuilder = new DbContextOptionsBuilder<DeepDrftContext>();
         optionsBuilder.UseNpgsql(connectionString);
-
         return new DeepDrftContext(optionsBuilder.Options);
     }
 }