notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/database] Revert "Remove configuration parsing for DesignTimeDbContext, as we don't need a valid database connection string"

Browse source 
This change made migration reverts impossible.

This reverts commit 64ef76be10.
This commit is contained in:
Laura Hausmann 2024-03-22 21:42:36 +01:00
parent 5be537e7dd
commit 82dfd5db1b
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Iceshrimp.Backend/Core/Database/DatabaseContext.cs
View file

@ -1285,9 +1285,14 @@ public class DesignTimeDatabaseContextFactory : IDesignTimeDbContextFactory<Data
{ {
DatabaseContext IDesignTimeDbContextFactory<DatabaseContext>.CreateDbContext(string[] args) DatabaseContext IDesignTimeDbContextFactory<DatabaseContext>.CreateDbContext(string[] args)
{ {
var npgsqlBuilder = new NpgsqlDataSourceBuilder { ConnectionStringBuilder = { Host = "localhost" } }; var configuration = new ConfigurationBuilder()
var dataSource = DatabaseContext.ConfigureDataSource(npgsqlBuilder); .SetBasePath(Directory.GetCurrentDirectory())
var builder = new DbContextOptionsBuilder<DatabaseContext>(); .AddCustomConfiguration()
.Build();
var config = configuration.GetSection("Database").Get<Config.DatabaseSection>();
var dataSource = DatabaseContext.GetDataSource(config);
var builder = new DbContextOptionsBuilder<DatabaseContext>();
DatabaseContext.Configure(builder, dataSource); DatabaseContext.Configure(builder, dataSource);
return new DatabaseContext(builder.Options); return new DatabaseContext(builder.Options);
} }