diff --git a/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs b/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs index a02f70256e..abe1a6d5df 100644 --- a/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs +++ b/src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs @@ -4,7 +4,7 @@ using Newtonsoft.Json.Converters; namespace Tgstation.Server.Host.Configuration { /// - /// Configuration options for the + /// Configuration options for the /// sealed class DatabaseConfiguration { diff --git a/src/Tgstation.Server.Host/Core/Application.cs b/src/Tgstation.Server.Host/Core/Application.cs index ac58267bc1..7f486eeb43 100644 --- a/src/Tgstation.Server.Host/Core/Application.cs +++ b/src/Tgstation.Server.Host/Core/Application.cs @@ -202,7 +202,7 @@ namespace Tgstation.Server.Host.Core // CORS conditionally enabled later services.AddCors(); - void AddTypedContext() where TContext : DatabaseContext + void AddTypedContext() where TContext : DatabaseContext { services.AddDbContext(builder => { diff --git a/src/Tgstation.Server.Host/Database/DatabaseContext.cs b/src/Tgstation.Server.Host/Database/DatabaseContext.cs index 82a974a01c..10dddb039d 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseContext.cs @@ -18,95 +18,94 @@ namespace Tgstation.Server.Host.Database /// /// Backend abstract implementation of /// - /// The child used to implement a backend. #pragma warning disable CA1506 // TODO: Decomplexify - abstract class DatabaseContext : DbContext, IDatabaseContext where TParentContext : DbContext + abstract class DatabaseContext : DbContext, IDatabaseContext { /// public DatabaseType DatabaseType => DatabaseConfiguration.DatabaseType; /// - /// The s in the . + /// The s in the . /// public DbSet Users { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet Instances { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet CompileJobs { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet RevisionInformations { get; set; } /// - /// The in the . + /// The in the . /// public DbSet DreamMakerSettings { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ChatBots { get; set; } /// - /// The in the . + /// The in the . /// public DbSet DreamDaemonSettings { get; set; } /// - /// The in the . + /// The in the . /// public DbSet RepositorySettings { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet InstanceUsers { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ChatChannels { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet Jobs { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet ReattachInformations { get; set; } /// - /// The s in the . + /// The s in the . /// public DbSet WatchdogReattachInformations { get; set; } /// - /// The s in the + /// The s in the /// public DbSet TestMerges { get; set; } /// - /// The s om the + /// The s om the /// public DbSet RevInfoTestMerges { get; set; } /// - /// The for the + /// The for the /// protected ILogger Logger { get; } /// - /// The for the + /// The for the /// protected DatabaseConfiguration DatabaseConfiguration { get; } @@ -150,7 +149,7 @@ namespace Tgstation.Server.Host.Database IDatabaseCollection IDatabaseContext.WatchdogReattachInformations => watchdogReattachInformationsCollection; /// - /// The for the + /// The for the /// readonly IDatabaseSeeder databaseSeeder; @@ -220,13 +219,13 @@ namespace Tgstation.Server.Host.Database readonly IDatabaseCollection watchdogReattachInformationsCollection; /// - /// Construct a + /// Construct a /// - /// The for the + /// The for the . /// The containing the value of /// The value of /// The value of - public DatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfigurationOptions, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions) + public DatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfigurationOptions, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions) { DatabaseConfiguration = databaseConfigurationOptions?.Value ?? throw new ArgumentNullException(nameof(databaseConfigurationOptions)); this.databaseSeeder = databaseSeeder ?? throw new ArgumentNullException(nameof(databaseSeeder)); @@ -410,7 +409,7 @@ namespace Tgstation.Server.Host.Database } /// - /// Ensure the is correct for the . + /// Ensure the is correct for the . /// protected abstract void ValidateDatabaseType(); } diff --git a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs index 7d13dfc80d..e7173b0067 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseSeeder.cs @@ -14,12 +14,12 @@ namespace Tgstation.Server.Host.Database sealed class DatabaseSeeder : IDatabaseSeeder { /// - /// The for the + /// The for the /// readonly ICryptographySuite cryptographySuite; /// - /// The for the . + /// The for the . /// readonly IPlatformIdentifier platformIdentifier; diff --git a/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs b/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs index 9699c86a16..98f71aeaaf 100644 --- a/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs +++ b/src/Tgstation.Server.Host/Database/Design/DesignTimeDbContextFactoryHelpers.cs @@ -4,7 +4,7 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database.Design { /// - /// Contains helpers for creating design time s + /// Contains helpers for creating design time s /// static class DesignTimeDbContextFactoryHelpers { @@ -14,7 +14,7 @@ namespace Tgstation.Server.Host.Database.Design /// The . /// The . /// The for the - public static IOptions GetDbContextOptions(DatabaseType databaseType, string connectionString) + public static IOptions GetDatabaseConfiguration(DatabaseType databaseType, string connectionString) { var dbConfig = new DatabaseConfiguration { diff --git a/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs index 61f2cfd8df..5b39d9e63d 100644 --- a/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/MySqlDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new MySqlDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.MariaDB, "Server=127.0.0.1;User Id=root;Password=fake;Database=TGS_Design"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs index 10963af511..2af7d7c939 100644 --- a/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/PostgresSqlDesignTimeDbContextFactory.cs @@ -18,7 +18,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new PostgresSqlDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.PostgresSql, "Application Name=tgstation-server;Host=127.0.0.1;Password=qCkWimNgLfWwpr7TnUHs;Username=postgres;Database=TGS_Design"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs index 68cc43ed2f..427d84ba8a 100644 --- a/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/SqlServerDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new SqlServerDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.SqlServer, "Data Source=fake;Initial Catalog=TGS_Design;Integrated Security=True;Application Name=tgstation-server"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs b/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs index ba5690ec75..91de1284f2 100644 --- a/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs +++ b/src/Tgstation.Server.Host/Database/Design/SqliteDesignTimeDbContextFactory.cs @@ -20,7 +20,7 @@ namespace Tgstation.Server.Host.Database.Design using var loggerFactory = new LoggerFactory(); return new SqliteDatabaseContext( new DbContextOptions(), - DesignTimeDbContextFactoryHelpers.GetDbContextOptions( + DesignTimeDbContextFactoryHelpers.GetDatabaseConfiguration( DatabaseType.Sqlite, "Data Source=tgs_design.sqlite3;Mode=ReadWriteCreate"), new DatabaseSeeder( diff --git a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs index 009ab4463b..c18d4e723e 100644 --- a/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs @@ -9,17 +9,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for MySQL + /// for MySQL /// - sealed class MySqlDatabaseContext : DatabaseContext + sealed class MySqlDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public MySqlDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { } diff --git a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs index 4042b423ab..111f3918ed 100644 --- a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs @@ -8,17 +8,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for PostgresSQL. + /// for PostgresSQL. /// - sealed class PostgresSqlDatabaseContext : DatabaseContext + sealed class PostgresSqlDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public PostgresSqlDatabaseContext( DbContextOptions dbContextOptions, IOptions databaseConfiguration, diff --git a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs index be2a4b4876..42c6aedc4e 100644 --- a/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/SqlServerDatabaseContext.cs @@ -7,17 +7,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for Sqlserver + /// for Sqlserver /// - sealed class SqlServerDatabaseContext : DatabaseContext + sealed class SqlServerDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public SqlServerDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { } diff --git a/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs b/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs index 2e71317a65..4d9fecf844 100644 --- a/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/SqliteDatabaseContext.cs @@ -9,17 +9,17 @@ using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database { /// - /// for MySQL + /// for MySQL /// - sealed class SqliteDatabaseContext : DatabaseContext + sealed class SqliteDatabaseContext : DatabaseContext { /// /// Construct a /// - /// The for the - /// The of for the - /// The for the - /// The for the + /// The for the + /// The of for the + /// The for the + /// The for the public SqliteDatabaseContext(DbContextOptions dbContextOptions, IOptions databaseConfiguration, IDatabaseSeeder databaseSeeder, ILogger logger) : base(dbContextOptions, databaseConfiguration, databaseSeeder, logger) { }