Moved drop DB command to database resource

SSWConsulting · Nov 6, 2024 · d6a4938 · d6a4938
1 parent 7c5e297
commit d6a4938
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/tools/AppHost/Commands/SqlServerCommandExt.cs b/tools/AppHost/Commands/SqlServerCommandExt.cs
@@ -3,17 +3,17 @@
 
 namespace AppHost.Commands;
 
-public static class SqlServerCommandExt
+public static class SqlServerDatabaseCommandExt
 {
-    public static IResourceBuilder<SqlServerServerResource> WithDropDatabaseCommand(
-        this IResourceBuilder<SqlServerServerResource> builder)
+    public static IResourceBuilder<SqlServerDatabaseResource> WithDropDatabaseCommand(
+        this IResourceBuilder<SqlServerDatabaseResource> builder)
     {
         builder.WithCommand(
             "drop-database",
             "Drop Database",
             async context =>
             {
-                var connectionString = await builder.Resource.GetConnectionStringAsync();
+                var connectionString = await builder.Resource.ConnectionStringExpression.GetValueAsync(default);
                 ArgumentException.ThrowIfNullOrWhiteSpace(connectionString);
 
                 var optionsBuilder = new DbContextOptionsBuilder<DbContext>();

diff --git a/tools/AppHost/Program.cs b/tools/AppHost/Program.cs
@@ -6,11 +6,11 @@
 // Ensure the port doesn't conflict with other docker containers (or remove it altogether)
 var sqlServer = builder
     .AddSqlServer("sql", port: 1800)
-    .WithDropDatabaseCommand()
     .WithLifetime(ContainerLifetime.Persistent);
 
 var db = sqlServer
-    .AddDatabase("clean-architecture");
+    .AddDatabase("clean-architecture")
+    .WithDropDatabaseCommand();
 
 var migrationService = builder.AddProject<MigrationService>("migrations")
     .WithReference(db)

diff --git a/tools/MigrationService/Worker.cs b/tools/MigrationService/Worker.cs
@@ -24,7 +24,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
             var warehouseInitializer = scope.ServiceProvider.GetRequiredService<ApplicationDbContextInitializer>();
             await warehouseInitializer.EnsureDatabaseAsync(stoppingToken);
-            await warehouseInitializer.CreateSchemaAsync(true, stoppingToken);
+            await warehouseInitializer.CreateSchemaAsync(false, stoppingToken);
 
             if (environment.IsDevelopment())
             {