From 82dfd5db1bf24351a65bbfe7b1b7a0d8fd6c1d16 Mon Sep 17 00:00:00 2001 From: Laura Hausmann Date: Fri, 22 Mar 2024 21:42:36 +0100 Subject: [PATCH] [backend/database] Revert "Remove configuration parsing for DesignTimeDbContext, as we don't need a valid database connection string" This change made migration reverts impossible. This reverts commit 64ef76be10f33714f6f52f6c30503f5537c211a9. --- Iceshrimp.Backend/Core/Database/DatabaseContext.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Iceshrimp.Backend/Core/Database/DatabaseContext.cs b/Iceshrimp.Backend/Core/Database/DatabaseContext.cs index 9f2ab7d2..f2544a9f 100644 --- a/Iceshrimp.Backend/Core/Database/DatabaseContext.cs +++ b/Iceshrimp.Backend/Core/Database/DatabaseContext.cs @@ -1285,9 +1285,14 @@ public class DesignTimeDatabaseContextFactory : IDesignTimeDbContextFactory.CreateDbContext(string[] args) { - var npgsqlBuilder = new NpgsqlDataSourceBuilder { ConnectionStringBuilder = { Host = "localhost" } }; - var dataSource = DatabaseContext.ConfigureDataSource(npgsqlBuilder); - var builder = new DbContextOptionsBuilder(); + var configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddCustomConfiguration() + .Build(); + + var config = configuration.GetSection("Database").Get(); + var dataSource = DatabaseContext.GetDataSource(config); + var builder = new DbContextOptionsBuilder(); DatabaseContext.Configure(builder, dataSource); return new DatabaseContext(builder.Options); }