From 84a70dc49ff2f6f783c2aef3c8e4e06aa071d10b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 24 May 2020 19:35:49 -0400 Subject: [PATCH] Disable Postgres for now --- .travis.yml | 42 +++++++++---------- .../Database/PostgresSqlDatabaseContext.cs | 4 ++ .../Setup/SetupWizard.cs | 6 ++- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5cce71d042..25cb4a535a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,27 +51,27 @@ jobs: packages: - libc6-i386 - libstdc++6:i386 - - env: - - DoxGeneration=false - - DockerBuild=false - - DMAPI=false - - CONFIG=Release - - TGS4_TEST_DATABASE_TYPE=PostgresSql - - TGS4_TEST_CONNECTION_STRING="Application Name=tgstation-server;Host=127.0.0.1;Username=postgres;Password=;Database=TGS_Test" - name: "PostgresSql Integration Test" - language: csharp - mono: none - dotnet: 3.1 - services: - - postgresql - cache: - directories: - - $HOME/.nuget/packages: - addons: - apt: - packages: - - libc6-i386 - - libstdc++6:i386 +# - env: +# - DoxGeneration=false +# - DockerBuild=false +# - DMAPI=false +# - CONFIG=Release +# - TGS4_TEST_DATABASE_TYPE=PostgresSql +# - TGS4_TEST_CONNECTION_STRING="Application Name=tgstation-server;Host=127.0.0.1;Username=postgres;Password=;Database=TGS_Test" +# name: "PostgresSql Integration Test" +# language: csharp +# mono: none +# dotnet: 3.1 +# services: +# - postgresql +# cache: +# directories: +# - $HOME/.nuget/packages: +# addons: +# apt: +# packages: +# - libc6-i386 +# - libstdc++6:i386 - env: - DoxGeneration=false - DockerBuild=false diff --git a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs index ea7cc6014d..de020b3653 100644 --- a/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs +++ b/src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs @@ -2,6 +2,7 @@ using Microsoft.Extensions.Logging; using Microsoft.Extensions.Options; using System; +using System.Diagnostics; using Tgstation.Server.Host.Configuration; namespace Tgstation.Server.Host.Database @@ -36,6 +37,9 @@ namespace Tgstation.Server.Host.Database /// protected override void ValidateDatabaseType() { + if (!Debugger.IsAttached) + throw new NotImplementedException("PostgresSQL implementation is not complete yet!"); + if (DatabaseType != DatabaseType.PostgresSql) throw new InvalidOperationException("Invalid DatabaseType for SqliteDatabaseContext!"); } diff --git a/src/Tgstation.Server.Host/Setup/SetupWizard.cs b/src/Tgstation.Server.Host/Setup/SetupWizard.cs index ce15e40f43..72eb7e3509 100644 --- a/src/Tgstation.Server.Host/Setup/SetupWizard.cs +++ b/src/Tgstation.Server.Host/Setup/SetupWizard.cs @@ -315,11 +315,13 @@ namespace Tgstation.Server.Host.Setup await console.WriteAsync( String.Format( CultureInfo.InvariantCulture, - "Please enter one of {0}, {1}, {2}, {3}, or {4}: ", + "Please enter one of {0}, {1}, {2}, or {3}: ", DatabaseType.MariaDB, DatabaseType.MySql, - DatabaseType.PostgresSql, +#pragma warning disable SA1515 // Single-line comment should be preceded by blank line + // DatabaseType.PostgresSql, DatabaseType.SqlServer, +#pragma warning restore SA1515 // Single-line comment should be preceded by blank line DatabaseType.Sqlite), false, cancellationToken)