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

Revert "A bit of DB model cleanup (#5016)"

Browse Source 
This reverts commit 8a3cee9a10.
This commit is contained in:
Pieter-Jan Briers
2021-10-29 16:10:58 +02:00
parent 8a3cee9a10
commit 5c5534de9a
8 changed files with 119 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -313,9 +313,6 @@ namespace Content.Server.Database
Username = user,
Password = pass
}.ConnectionString;
Logger.DebugS("db.manager", $"Using Postgres \"{host}:{port}/{db}\"");
builder.UseNpgsql(connectionString);
SetupLogging(builder);
return builder.Options;
@@ -332,12 +329,10 @@ namespace Content.Server.Database
if (!inMemory)
{
var finalPreferencesDbPath = Path.Combine(_res.UserData.RootDir!, configPreferencesDbPath);
Logger.DebugS("db.manager", $"Using SQLite DB \"{finalPreferencesDbPath}\"");
connection = new SqliteConnection($"Data Source={finalPreferencesDbPath}");
}
else
{
Logger.DebugS("db.manager", $"Using in-memory SQLite DB");
connection = new SqliteConnection("Data Source=:memory:");
// When using an in-memory DB we have to open it manually
// so EFCore doesn't open, close and wipe it.