tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DbContext configuration nightmares.

Browse Source 
Thanks to julian figuring out IDesignTimeDbContextFactory exists in #6327.

All this DbContext configuration and options setup stuff is insane. Microsoft should be absolutely ashamed for coming up with this load of garbage.
This commit is contained in:
Pieter-Jan Briers
2022-02-03 03:13:34 +01:00
parent 32a1f6ae93
commit 4da56becab
8 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Database/ServerDbManager.cs
View File

@@ -180,12 +180,12 @@ namespace Content.Server.Database
switch (engine)
{
case "sqlite":
var options = CreateSqliteOptions();
_db = new ServerDbSqlite(options);
var sqliteOptions = CreateSqliteOptions();
_db = new ServerDbSqlite(sqliteOptions);
break;
case "postgres":
options = CreatePostgresOptions();
_db = new ServerDbPostgres(options);
var pgOptions = CreatePostgresOptions();
_db = new ServerDbPostgres(pgOptions);
break;
default:
throw new InvalidDataException($"Unknown database engine {engine}.");
@@ -394,7 +394,7 @@ namespace Content.Server.Database
return _db.RemoveFromWhitelistAsync(player);
}
private DbContextOptions<ServerDbContext> CreatePostgresOptions()
private DbContextOptions<PostgresServerDbContext> CreatePostgresOptions()
{
var host = _cfg.GetCVar(CCVars.DatabasePgHost);
var port = _cfg.GetCVar(CCVars.DatabasePgPort);
@@ -402,7 +402,7 @@ namespace Content.Server.Database
var user = _cfg.GetCVar(CCVars.DatabasePgUsername);
var pass = _cfg.GetCVar(CCVars.DatabasePgPassword);
var builder = new DbContextOptionsBuilder<ServerDbContext>();
var builder = new DbContextOptionsBuilder<PostgresServerDbContext>();
var connectionString = new NpgsqlConnectionStringBuilder
{
Host = host,
@@ -419,9 +419,9 @@ namespace Content.Server.Database
return builder.Options;
}
private DbContextOptions<ServerDbContext> CreateSqliteOptions()
private DbContextOptions<SqliteServerDbContext> CreateSqliteOptions()
{
var builder = new DbContextOptionsBuilder<ServerDbContext>();
var builder = new DbContextOptionsBuilder<SqliteServerDbContext>();
var configPreferencesDbPath = _cfg.GetCVar(CCVars.DatabaseSqliteDbPath);
var inMemory = _res.UserData.RootDir == null;
@@ -447,7 +447,7 @@ namespace Content.Server.Database
return builder.Options;
}
private void SetupLogging(DbContextOptionsBuilder<ServerDbContext> builder)
private void SetupLogging(DbContextOptionsBuilder builder)
{
builder.UseLoggerFactory(_msLoggerFactory);
}