From 9cdaef04108480244839c90f2c16fefe11eb3dae Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 30 Dec 2020 11:43:41 -0500 Subject: [PATCH] Remove all debug conditionals - Add a down migrations comment --- .../Database/DatabaseContext.cs | 15 +++++++++------ .../Tgstation.Server.Host.csproj | 5 ----- tests/Tgstation.Server.Tests/IntegrationTest.cs | 2 -- tests/Tgstation.Server.Tests/VersionsTest.cs | 2 -- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/Tgstation.Server.Host/Database/DatabaseContext.cs b/src/Tgstation.Server.Host/Database/DatabaseContext.cs index 7d2b7a2d51..9de0ffa3f2 100644 --- a/src/Tgstation.Server.Host/Database/DatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/DatabaseContext.cs @@ -369,27 +369,30 @@ namespace Tgstation.Server.Host.Database return wasEmpty; } -#if DEBUG + // HEY YOU + // IF YOU HAVE A TEST THAT'S CREATING ERRORS BECAUSE THESE VALUES AREN'T SET CORRECTLY THERE'S MORE TO FIXING IT THAN JUST UPDATING THEM + // IN THE FUNCTION BELOW YOU ALSO NEED TO CORRECTLY SET THE RIGHT MIGRATION TO DOWNLOAD TO FOR THE LAST TGS VERSION + // IF THIS BREAKS AGAIN I WILL PERSONALLY HAUNT YOUR ASS WHEN I DIE + /// /// Used by unit tests to remind us to setup the correct MSSQL migration downgrades. /// - public static readonly Type MSLatestMigration = typeof(MSAddSwarmIdentifer); + internal static readonly Type MSLatestMigration = typeof(MSAddSwarmIdentifer); /// /// Used by unit tests to remind us to setup the correct MYSQL migration downgrades. /// - public static readonly Type MYLatestMigration = typeof(MYAddSwarmIdentifer); + internal static readonly Type MYLatestMigration = typeof(MYAddSwarmIdentifer); /// /// Used by unit tests to remind us to setup the correct PostgresSQL migration downgrades. /// - public static readonly Type PGLatestMigration = typeof(PGAddSwarmIdentifer); + internal static readonly Type PGLatestMigration = typeof(PGAddSwarmIdentifer); /// /// Used by unit tests to remind us to setup the correct SQLite migration downgrades. /// - public static readonly Type SLLatestMigration = typeof(SLAddSwarmIdentifer); -#endif + internal static readonly Type SLLatestMigration = typeof(SLAddSwarmIdentifer); /// #pragma warning disable CA1502 // Cyclomatic complexity diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index e29b19b44e..3951c10411 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -105,11 +105,6 @@ - - - - - diff --git a/tests/Tgstation.Server.Tests/IntegrationTest.cs b/tests/Tgstation.Server.Tests/IntegrationTest.cs index a4fa6f3b86..3d003e67ad 100644 --- a/tests/Tgstation.Server.Tests/IntegrationTest.cs +++ b/tests/Tgstation.Server.Tests/IntegrationTest.cs @@ -330,7 +330,6 @@ namespace Tgstation.Server.Tests } } -#if DEBUG [TestMethod] public async Task TestDownMigrations() { @@ -475,7 +474,6 @@ namespace Tgstation.Server.Tests await migrator.MigrateAsync(migrationName, default); await context.Database.EnsureDeletedAsync(); } -#endif [TestMethod] public async Task TestServer() diff --git a/tests/Tgstation.Server.Tests/VersionsTest.cs b/tests/Tgstation.Server.Tests/VersionsTest.cs index e96c445081..1a1cf908da 100644 --- a/tests/Tgstation.Server.Tests/VersionsTest.cs +++ b/tests/Tgstation.Server.Tests/VersionsTest.cs @@ -146,7 +146,6 @@ namespace Tgstation.Server.Tests Assert.IsNotNull(line); } -#if DEBUG [TestMethod] public void TestDowngradeMigrations() { @@ -201,6 +200,5 @@ namespace Tgstation.Server.Tests Assert.AreEqual(latestMigrationPG, DatabaseContext.PGLatestMigration); Assert.AreEqual(latestMigrationSL, DatabaseContext.SLLatestMigration); } -#endif } }