Merge pull request #1030 from tgstation/979-EnablePostgres [TGSDeploy][APIDeploy][NugetDeploy]

Enable Postgres

.travis.yml

@@ -51,27 +51,29 @@ 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
+      - POSTGRESFIX=true
+      - CONFIG=Release
+      - TGS4_TEST_DATABASE_TYPE=PostgresSql
+      - TGS4_TEST_CONNECTION_STRING="Application Name=tgstation-server;Port=5433;Host=127.0.0.1;Username=testuser;Password=password;Database=TGS_Test"
+      - PGPORT=5433
+      name: "PostgresSql Integration Test"
+      language: csharp
+      mono: none
+      dotnet: 3.1
+      cache:
+        directories:
+          - $HOME/.nuget/packages:
+      addons:
+        postgresql: "12"
+        apt:
+          packages:
+            - postgresql-12
+            - libc6-i386
+            - libstdc++6:i386
     - env:
       - DoxGeneration=false
       - DockerBuild=false
@@ -127,6 +129,10 @@ jobs:
             - libc6-i386
             - libstdc++6:i386
 
+before_install:
+  - if [ $POSTGRESFIX = true ]; then sudo -u postgres psql -c "CREATE USER testuser WITH PASSWORD 'password'"; fi
+  - if [ $POSTGRESFIX = true ]; then sudo -u postgres psql -c "ALTER ROLE testuser SUPERUSER"; fi
+
 install:
   - if [ $DoxGeneration = false ] && [ $DockerBuild = false ] && [ $DMAPI = true ]; then build/install_byond.sh; fi
   - if [ $DoxGeneration = false ] && [ $DockerBuild = false ] && [ $DMAPI = false ]; then dotnet restore tgstation-server.sln; fi

README.md

@@ -103,7 +103,7 @@ Create an `appsettings.Production.json` file next to `appsettings.json`. This wi
 
 - `Database:DatabaseType`: Can be one of `SqlServer`, `MariaDB`, `MySql`, or `Sqlite`.
 
-- `Database:MySqlServerVersion`: The version of MySql/MariaDB the database resides on, can be left as null for attempted auto detection. Used by the MySQL/MariaDB provider for selection of [certain features](https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/blob/2.2.6/src/EFCore.MySql/Storage/Internal/ServerVersion.cs) ignore at your own risk. A string in the form `<major>.<minor>.<patch>`
+- `Database:ServerVersion`: The version of the database server. Used by the MySQL/MariaDB and Postgres providers for selection of certain features, ignore at your own risk. A string in the form `<major>.<minor>.<patch>` for MySQL/MariaDB or `<major>.<minor>` for Postgres.
 
 - `Database:ConnectionString`: Connection string for your database. Click [here](https://www.developerfusion.com/tools/sql-connection-string/) for an SQL Server generator or see [here](https://www.connectionstrings.com/mysql/) for a MySQL guide ([You should probably use '127.0.0.1' instead of 'localhost'](https://stackoverflow.com/questions/19712307/mysql-localhost-127-0-0-1)).
 

src/Tgstation.Server.Api/Models/ErrorCode.cs

@@ -325,7 +325,7 @@ namespace Tgstation.Server.Api.Models
 		/// <summary>
 		/// The DMAPI never validated itself
 		/// </summary>
-		[Description("DreamDaemon exited without validating the DMAPI@")]
+		[Description("DreamDaemon exited without validating the DMAPI!")]
 		DreamMakerNeverValidated,
 
 		/// <summary>

src/Tgstation.Server.Host/Components/Session/ReattachInfoHandler.cs

@@ -56,11 +56,12 @@ namespace Tgstation.Server.Host.Components.Session
 
 			logger.LogDebug("Saving reattach information: {0}...", reattachInformation);
 
-			var deleteTask = db
+			await db
 				.WatchdogReattachInformations
 				.AsQueryable()
 				.Where(x => x.InstanceId == metadata.Id)
-				.DeleteAsync(cancellationToken);
+				.DeleteAsync(cancellationToken)
+				.ConfigureAwait(false);
 
 			Models.ReattachInformation ConvertReattachInfo(ReattachInformation wdInfo)
 			{
@@ -79,8 +80,6 @@ namespace Tgstation.Server.Host.Components.Session
 				};
 			}
 
-			await deleteTask.ConfigureAwait(false);
-
 			db.WatchdogReattachInformations.Add(new Models.DualReattachInformation
 			{
 				Alpha = ConvertReattachInfo(reattachInformation.Alpha),

src/Tgstation.Server.Host/Configuration/DatabaseConfiguration.cs

@@ -40,8 +40,8 @@ namespace Tgstation.Server.Host.Configuration
 		public bool DesignTime { get; set; }
 
 		/// <summary>
-		/// The <see cref="string"/> form of the <see cref="global::System.Version"/> of a target MySQL/MariaDB server
+		/// The <see cref="string"/> form of the <see cref="global::System.Version"/> of the target server
 		/// </summary>
-		public string MySqlServerVersion { get; set; }
+		public string ServerVersion { get; set; }
 	}
 }

src/Tgstation.Server.Host/Core/Application.cs

@@ -354,7 +354,11 @@ namespace Tgstation.Server.Host.Core
 
 			// attempt to restart the server if the configuration changes
 			if (serverControl.WatchdogPresent)
-				ChangeToken.OnChange(Configuration.GetReloadToken, () => serverControl.Restart());
+				ChangeToken.OnChange(Configuration.GetReloadToken, () =>
+				{
+					logger.LogInformation("Configuration change detected");
+					serverControl.Restart();
+				});
 
 			// setup the HTTP request pipeline
 			// Final point where we wrap exceptions in a 500 (ErrorMessage) response

src/Tgstation.Server.Host/Database/DatabaseContext.cs

@@ -109,6 +109,11 @@ namespace Tgstation.Server.Host.Database
 		/// </summary>
 		protected DatabaseConfiguration DatabaseConfiguration { get; }
 
+		/// <summary>
+		/// The <see cref="DeleteBehavior"/> for the <see cref="CompileJob"/>/<see cref="RevisionInformation"/> foreign key.
+		/// </summary>
+		protected virtual DeleteBehavior RevInfoCompileJobDeleteBehavior => DeleteBehavior.ClientNoAction;
+
 		/// <inheritdoc />
 		IDatabaseCollection<User> IDatabaseContext.Users => usersCollection;
 
@@ -271,7 +276,8 @@ namespace Tgstation.Server.Host.Database
 			// rev info takes care of the rest
 			// Break the link here so the db doesn't shit itself complaining about cascading deletes
 			// EF will handle making the right query to destroy everything
-			revInfo.HasMany(x => x.CompileJobs).WithOne(x => x.RevisionInformation).OnDelete(DeleteBehavior.ClientNoAction);
+			// UPDATE: I fuck with this constantly in hopes of eliminating FK issues on instance detack
+			revInfo.HasMany(x => x.CompileJobs).WithOne(x => x.RevisionInformation).OnDelete(RevInfoCompileJobDeleteBehavior);
 
 			// Also break the link between ritm and testmerge so it doesn't cycle in a triangle with rev info
 			modelBuilder.Entity<TestMerge>().HasMany(x => x.RevisonInformations).WithOne(x => x.TestMerge).OnDelete(DeleteBehavior.ClientNoAction);

src/Tgstation.Server.Host/Database/Migrations/20200516111712_PGCreate.Designer.cs

@@ -674,7 +674,7 @@ namespace Tgstation.Server.Host.Database.Migrations
 					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
 						.WithMany("CompileJobs")
 						.HasForeignKey("RevisionInformationId")
-						.OnDelete(DeleteBehavior.ClientNoAction)
+						.OnDelete(DeleteBehavior.Cascade)
 						.IsRequired();
 				});
 

src/Tgstation.Server.Host/Database/Migrations/20200516111712_PGCreate.cs

@@ -346,7 +346,8 @@ namespace Tgstation.Server.Host.Database.Migrations
 						name: "FK_CompileJobs_RevisionInformations_RevisionInformationId",
 						column: x => x.RevisionInformationId,
 						principalTable: "RevisionInformations",
-						principalColumn: "Id");
+						principalColumn: "Id",
+						onDelete: ReferentialAction.Cascade);
 				});
 
 			migrationBuilder.CreateTable(

src/Tgstation.Server.Host/Database/Migrations/20200529171541_MYFixForeignKey.Designer.cs

@@ -0,0 +1,808 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Tgstation.Server.Host.Database.Migrations
+{
+	[DbContext(typeof(MySqlDatabaseContext))]
+	[Migration("20200529171541_MYFixForeignKey")]
+	partial class MYFixForeignKey
+	{
+		/// <inheritdoc />
+		protected override void BuildTargetModel(ModelBuilder modelBuilder)
+		{
+#pragma warning disable 612, 618
+			modelBuilder
+				.HasAnnotation("ProductVersion", "3.1.4")
+				.HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<ushort?>("ChannelLimit")
+						.IsRequired()
+						.HasColumnType("smallint unsigned");
+
+					b.Property<string>("ConnectionString")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<bool?>("Enabled")
+						.HasColumnType("tinyint(1)");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<string>("Name")
+						.IsRequired()
+						.HasColumnType("varchar(100) CHARACTER SET utf8mb4")
+						.HasMaxLength(100);
+
+					b.Property<int>("Provider")
+						.HasColumnType("int");
+
+					b.Property<uint?>("ReconnectionInterval")
+						.IsRequired()
+						.HasColumnType("int unsigned");
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId", "Name")
+						.IsUnique();
+
+					b.ToTable("ChatBots");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<long>("ChatSettingsId")
+						.HasColumnType("bigint");
+
+					b.Property<ulong?>("DiscordChannelId")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<string>("IrcChannel")
+						.HasColumnType("varchar(100) CHARACTER SET utf8mb4")
+						.HasMaxLength(100);
+
+					b.Property<bool?>("IsAdminChannel")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("IsUpdatesChannel")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("IsWatchdogChannel")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<string>("Tag")
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.HasKey("Id");
+
+					b.HasIndex("ChatSettingsId", "DiscordChannelId")
+						.IsUnique();
+
+					b.HasIndex("ChatSettingsId", "IrcChannel")
+						.IsUnique();
+
+					b.ToTable("ChatChannels");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<string>("ByondVersion")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<int?>("DMApiMajorVersion")
+						.HasColumnType("int");
+
+					b.Property<int?>("DMApiMinorVersion")
+						.HasColumnType("int");
+
+					b.Property<int?>("DMApiPatchVersion")
+						.HasColumnType("int");
+
+					b.Property<Guid?>("DirectoryName")
+						.IsRequired()
+						.HasColumnType("char(36)");
+
+					b.Property<string>("DmeName")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<long>("JobId")
+						.HasColumnType("bigint");
+
+					b.Property<int>("MinimumSecurityLevel")
+						.HasColumnType("int");
+
+					b.Property<string>("Output")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<long>("RevisionInformationId")
+						.HasColumnType("bigint");
+
+					b.HasKey("Id");
+
+					b.HasIndex("DirectoryName");
+
+					b.HasIndex("JobId")
+						.IsUnique();
+
+					b.HasIndex("RevisionInformationId");
+
+					b.ToTable("CompileJobs");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<bool?>("AllowWebClient")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("AutoStart")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<uint?>("HeartbeatSeconds")
+						.IsRequired()
+						.HasColumnType("int unsigned");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<ushort?>("PrimaryPort")
+						.IsRequired()
+						.HasColumnType("smallint unsigned");
+
+					b.Property<ushort?>("SecondaryPort")
+						.IsRequired()
+						.HasColumnType("smallint unsigned");
+
+					b.Property<int>("SecurityLevel")
+						.HasColumnType("int");
+
+					b.Property<uint?>("StartupTimeout")
+						.IsRequired()
+						.HasColumnType("int unsigned");
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId")
+						.IsUnique();
+
+					b.ToTable("DreamDaemonSettings");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<ushort?>("ApiValidationPort")
+						.IsRequired()
+						.HasColumnType("smallint unsigned");
+
+					b.Property<int>("ApiValidationSecurityLevel")
+						.HasColumnType("int");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<string>("ProjectName")
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId")
+						.IsUnique();
+
+					b.ToTable("DreamMakerSettings");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DualReattachInformation", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<long?>("AlphaId")
+						.HasColumnType("bigint");
+
+					b.Property<bool>("AlphaIsActive")
+						.HasColumnType("tinyint(1)");
+
+					b.Property<long?>("BravoId")
+						.HasColumnType("bigint");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.HasKey("Id");
+
+					b.HasIndex("AlphaId");
+
+					b.HasIndex("BravoId");
+
+					b.HasIndex("InstanceId")
+						.IsUnique();
+
+					b.ToTable("WatchdogReattachInformations");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<uint?>("AutoUpdateInterval")
+						.IsRequired()
+						.HasColumnType("int unsigned");
+
+					b.Property<ushort?>("ChatBotLimit")
+						.IsRequired()
+						.HasColumnType("smallint unsigned");
+
+					b.Property<int>("ConfigurationType")
+						.HasColumnType("int");
+
+					b.Property<string>("Name")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<bool?>("Online")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<string>("Path")
+						.IsRequired()
+						.HasColumnType("varchar(255) CHARACTER SET utf8mb4");
+
+					b.HasKey("Id");
+
+					b.HasIndex("Path")
+						.IsUnique();
+
+					b.ToTable("Instances");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<ulong>("ByondRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong>("ChatBotRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong>("ConfigurationRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong>("DreamDaemonRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong>("DreamMakerRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<ulong>("InstanceUserRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong>("RepositoryRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<long?>("UserId")
+						.IsRequired()
+						.HasColumnType("bigint");
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId");
+
+					b.HasIndex("UserId", "InstanceId")
+						.IsUnique();
+
+					b.ToTable("InstanceUsers");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<ulong?>("CancelRight")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<ulong?>("CancelRightsType")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<bool?>("Cancelled")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<long?>("CancelledById")
+						.HasColumnType("bigint");
+
+					b.Property<string>("Description")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<uint?>("ErrorCode")
+						.HasColumnType("int unsigned");
+
+					b.Property<string>("ExceptionDetails")
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<DateTimeOffset?>("StartedAt")
+						.IsRequired()
+						.HasColumnType("datetime(6)");
+
+					b.Property<long>("StartedById")
+						.HasColumnType("bigint");
+
+					b.Property<DateTimeOffset?>("StoppedAt")
+						.HasColumnType("datetime(6)");
+
+					b.HasKey("Id");
+
+					b.HasIndex("CancelledById");
+
+					b.HasIndex("InstanceId");
+
+					b.HasIndex("StartedById");
+
+					b.ToTable("Jobs");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<string>("AccessIdentifier")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<long>("CompileJobId")
+						.HasColumnType("bigint");
+
+					b.Property<bool>("IsPrimary")
+						.HasColumnType("tinyint(1)");
+
+					b.Property<int>("LaunchSecurityLevel")
+						.HasColumnType("int");
+
+					b.Property<ushort>("Port")
+						.HasColumnType("smallint unsigned");
+
+					b.Property<int>("ProcessId")
+						.HasColumnType("int");
+
+					b.Property<int>("RebootState")
+						.HasColumnType("int");
+
+					b.HasKey("Id");
+
+					b.HasIndex("CompileJobId");
+
+					b.ToTable("ReattachInformations");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<string>("AccessToken")
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<string>("AccessUser")
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<bool?>("AutoUpdatesKeepTestMerges")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("AutoUpdatesSynchronize")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<string>("CommitterEmail")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<string>("CommitterName")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<bool?>("PostTestMergeComment")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("PushTestMergeCommits")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<bool?>("ShowTestMergeCommitters")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId")
+						.IsUnique();
+
+					b.ToTable("RepositorySettings");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<long>("RevisionInformationId")
+						.HasColumnType("bigint");
+
+					b.Property<long>("TestMergeId")
+						.HasColumnType("bigint");
+
+					b.HasKey("Id");
+
+					b.HasIndex("RevisionInformationId");
+
+					b.HasIndex("TestMergeId");
+
+					b.ToTable("RevInfoTestMerges");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<string>("CommitSha")
+						.IsRequired()
+						.HasColumnType("varchar(40) CHARACTER SET utf8mb4")
+						.HasMaxLength(40);
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.Property<string>("OriginCommitSha")
+						.IsRequired()
+						.HasColumnType("varchar(40) CHARACTER SET utf8mb4")
+						.HasMaxLength(40);
+
+					b.HasKey("Id");
+
+					b.HasIndex("InstanceId", "CommitSha")
+						.IsUnique();
+
+					b.ToTable("RevisionInformations");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<string>("Author")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<string>("BodyAtMerge")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<string>("Comment")
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<DateTimeOffset>("MergedAt")
+						.HasColumnType("datetime(6)");
+
+					b.Property<long>("MergedById")
+						.HasColumnType("bigint");
+
+					b.Property<int>("Number")
+						.HasColumnType("int");
+
+					b.Property<long?>("PrimaryRevisionInformationId")
+						.IsRequired()
+						.HasColumnType("bigint");
+
+					b.Property<string>("PullRequestRevision")
+						.IsRequired()
+						.HasColumnType("varchar(40) CHARACTER SET utf8mb4")
+						.HasMaxLength(40);
+
+					b.Property<string>("TitleAtMerge")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<string>("Url")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.HasKey("Id");
+
+					b.HasIndex("MergedById");
+
+					b.HasIndex("PrimaryRevisionInformationId")
+						.IsUnique();
+
+					b.ToTable("TestMerges");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
+				{
+					b.Property<long?>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<ulong>("AdministrationRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<string>("CanonicalName")
+						.IsRequired()
+						.HasColumnType("varchar(255) CHARACTER SET utf8mb4");
+
+					b.Property<DateTimeOffset?>("CreatedAt")
+						.IsRequired()
+						.HasColumnType("datetime(6)");
+
+					b.Property<long?>("CreatedById")
+						.HasColumnType("bigint");
+
+					b.Property<bool?>("Enabled")
+						.IsRequired()
+						.HasColumnType("tinyint(1)");
+
+					b.Property<ulong>("InstanceManagerRights")
+						.HasColumnType("bigint unsigned");
+
+					b.Property<DateTimeOffset?>("LastPasswordUpdate")
+						.HasColumnType("datetime(6)");
+
+					b.Property<string>("Name")
+						.IsRequired()
+						.HasColumnType("longtext CHARACTER SET utf8mb4")
+						.HasMaxLength(10000);
+
+					b.Property<string>("PasswordHash")
+						.HasColumnType("longtext CHARACTER SET utf8mb4");
+
+					b.Property<string>("SystemIdentifier")
+						.HasColumnType("varchar(255) CHARACTER SET utf8mb4");
+
+					b.HasKey("Id");
+
+					b.HasIndex("CanonicalName")
+						.IsUnique();
+
+					b.HasIndex("CreatedById");
+
+					b.HasIndex("SystemIdentifier")
+						.IsUnique();
+
+					b.ToTable("Users");
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithMany("ChatSettings")
+						.HasForeignKey("InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatChannel", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.ChatBot", "ChatSettings")
+						.WithMany("Channels")
+						.HasForeignKey("ChatSettingsId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.CompileJob", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Job", "Job")
+						.WithOne()
+						.HasForeignKey("Tgstation.Server.Host.Models.CompileJob", "JobId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+
+					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
+						.WithMany("CompileJobs")
+						.HasForeignKey("RevisionInformationId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DreamDaemonSettings", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithOne("DreamDaemonSettings")
+						.HasForeignKey("Tgstation.Server.Host.Models.DreamDaemonSettings", "InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DreamMakerSettings", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithOne("DreamMakerSettings")
+						.HasForeignKey("Tgstation.Server.Host.Models.DreamMakerSettings", "InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DualReattachInformation", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Alpha")
+						.WithMany()
+						.HasForeignKey("AlphaId");
+
+					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Bravo")
+						.WithMany()
+						.HasForeignKey("BravoId");
+
+					b.HasOne("Tgstation.Server.Host.Models.Instance", null)
+						.WithOne("WatchdogReattachInformation")
+						.HasForeignKey("Tgstation.Server.Host.Models.DualReattachInformation", "InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithMany("InstanceUsers")
+						.HasForeignKey("InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+
+					b.HasOne("Tgstation.Server.Host.Models.User", null)
+						.WithMany("InstanceUsers")
+						.HasForeignKey("UserId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.Job", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.User", "CancelledBy")
+						.WithMany()
+						.HasForeignKey("CancelledById");
+
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithMany("Jobs")
+						.HasForeignKey("InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+
+					b.HasOne("Tgstation.Server.Host.Models.User", "StartedBy")
+						.WithMany()
+						.HasForeignKey("StartedById")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.ReattachInformation", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.CompileJob", "CompileJob")
+						.WithMany()
+						.HasForeignKey("CompileJobId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RepositorySettings", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithOne("RepositorySettings")
+						.HasForeignKey("Tgstation.Server.Host.Models.RepositorySettings", "InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RevInfoTestMerge", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
+						.WithMany("ActiveTestMerges")
+						.HasForeignKey("RevisionInformationId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+
+					b.HasOne("Tgstation.Server.Host.Models.TestMerge", "TestMerge")
+						.WithMany("RevisonInformations")
+						.HasForeignKey("TestMergeId")
+						.OnDelete(DeleteBehavior.ClientNoAction)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.RevisionInformation", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
+						.WithMany("RevisionInformations")
+						.HasForeignKey("InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.TestMerge", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.User", "MergedBy")
+						.WithMany("TestMerges")
+						.HasForeignKey("MergedById")
+						.OnDelete(DeleteBehavior.Restrict)
+						.IsRequired();
+
+					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "PrimaryRevisionInformation")
+						.WithOne("PrimaryTestMerge")
+						.HasForeignKey("Tgstation.Server.Host.Models.TestMerge", "PrimaryRevisionInformationId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
+			modelBuilder.Entity("Tgstation.Server.Host.Models.User", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.User", "CreatedBy")
+						.WithMany("CreatedUsers")
+						.HasForeignKey("CreatedById");
+				});
+#pragma warning restore 612, 618
+		}
+	}
+}

src/Tgstation.Server.Host/Database/Migrations/20200529171541_MYFixForeignKey.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+using System;
+
+namespace Tgstation.Server.Host.Database.Migrations
+{
+	/// <summary>
+	/// Fix the CompileJob/RevisionInformation foreign key for MySQL.
+	/// </summary>
+	public partial class MYFixForeignKey : Migration
+	{
+		/// <inheritdoc />
+		protected override void Up(MigrationBuilder migrationBuilder)
+		{
+			if (migrationBuilder == null)
+				throw new ArgumentNullException(nameof(migrationBuilder));
+
+			migrationBuilder.DropForeignKey(
+				name: "FK_CompileJobs_RevisionInformations_RevisionInformationId",
+				table: "CompileJobs");
+
+			migrationBuilder.AddForeignKey(
+				name: "FK_CompileJobs_RevisionInformations_RevisionInformationId",
+				table: "CompileJobs",
+				column: "RevisionInformationId",
+				principalTable: "RevisionInformations",
+				principalColumn: "Id",
+				onDelete: ReferentialAction.Cascade);
+		}
+
+		/// <inheritdoc />
+		protected override void Down(MigrationBuilder migrationBuilder)
+		{
+			if (migrationBuilder == null)
+				throw new ArgumentNullException(nameof(migrationBuilder));
+
+			migrationBuilder.DropForeignKey(
+				name: "FK_CompileJobs_RevisionInformations_RevisionInformationId",
+				table: "CompileJobs");
+
+			migrationBuilder.AddForeignKey(
+				name: "FK_CompileJobs_RevisionInformations_RevisionInformationId",
+				table: "CompileJobs",
+				column: "RevisionInformationId",
+				principalTable: "RevisionInformations",
+				principalColumn: "Id");
+		}
+	}
+}

src/Tgstation.Server.Host/Database/Migrations/MySqlDatabaseContextModelSnapshot.cs

@@ -12,7 +12,7 @@ namespace Tgstation.Server.Host.Database.Migrations
 		{
 #pragma warning disable 612, 618
 			modelBuilder
-				.HasAnnotation("ProductVersion", "3.1.3")
+				.HasAnnotation("ProductVersion", "3.1.4")
 				.HasAnnotation("Relational:MaxIdentifierLength", 64);
 
 			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
@@ -223,6 +223,36 @@ namespace Tgstation.Server.Host.Database.Migrations
 					b.ToTable("DreamMakerSettings");
 				});
 
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DualReattachInformation", b =>
+				{
+					b.Property<long>("Id")
+						.ValueGeneratedOnAdd()
+						.HasColumnType("bigint");
+
+					b.Property<long?>("AlphaId")
+						.HasColumnType("bigint");
+
+					b.Property<bool>("AlphaIsActive")
+						.HasColumnType("tinyint(1)");
+
+					b.Property<long?>("BravoId")
+						.HasColumnType("bigint");
+
+					b.Property<long>("InstanceId")
+						.HasColumnType("bigint");
+
+					b.HasKey("Id");
+
+					b.HasIndex("AlphaId");
+
+					b.HasIndex("BravoId");
+
+					b.HasIndex("InstanceId")
+						.IsUnique();
+
+					b.ToTable("WatchdogReattachInformations");
+				});
+
 			modelBuilder.Entity("Tgstation.Server.Host.Models.Instance", b =>
 				{
 					b.Property<long>("Id")
@@ -604,36 +634,6 @@ namespace Tgstation.Server.Host.Database.Migrations
 					b.ToTable("Users");
 				});
 
-			modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
-				{
-					b.Property<long>("Id")
-						.ValueGeneratedOnAdd()
-						.HasColumnType("bigint");
-
-					b.Property<long?>("AlphaId")
-						.HasColumnType("bigint");
-
-					b.Property<bool>("AlphaIsActive")
-						.HasColumnType("tinyint(1)");
-
-					b.Property<long?>("BravoId")
-						.HasColumnType("bigint");
-
-					b.Property<long>("InstanceId")
-						.HasColumnType("bigint");
-
-					b.HasKey("Id");
-
-					b.HasIndex("AlphaId");
-
-					b.HasIndex("BravoId");
-
-					b.HasIndex("InstanceId")
-						.IsUnique();
-
-					b.ToTable("WatchdogReattachInformations");
-				});
-
 			modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b =>
 				{
 					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
@@ -663,7 +663,7 @@ namespace Tgstation.Server.Host.Database.Migrations
 					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
 						.WithMany("CompileJobs")
 						.HasForeignKey("RevisionInformationId")
-						.OnDelete(DeleteBehavior.ClientNoAction)
+						.OnDelete(DeleteBehavior.Cascade)
 						.IsRequired();
 				});
 
@@ -685,6 +685,23 @@ namespace Tgstation.Server.Host.Database.Migrations
 						.IsRequired();
 				});
 
+			modelBuilder.Entity("Tgstation.Server.Host.Models.DualReattachInformation", b =>
+				{
+					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Alpha")
+						.WithMany()
+						.HasForeignKey("AlphaId");
+
+					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Bravo")
+						.WithMany()
+						.HasForeignKey("BravoId");
+
+					b.HasOne("Tgstation.Server.Host.Models.Instance", null)
+						.WithOne("WatchdogReattachInformation")
+						.HasForeignKey("Tgstation.Server.Host.Models.DualReattachInformation", "InstanceId")
+						.OnDelete(DeleteBehavior.Cascade)
+						.IsRequired();
+				});
+
 			modelBuilder.Entity("Tgstation.Server.Host.Models.InstanceUser", b =>
 				{
 					b.HasOne("Tgstation.Server.Host.Models.Instance", "Instance")
@@ -782,23 +799,6 @@ namespace Tgstation.Server.Host.Database.Migrations
 						.WithMany("CreatedUsers")
 						.HasForeignKey("CreatedById");
 				});
-
-			modelBuilder.Entity("Tgstation.Server.Host.Models.WatchdogReattachInformation", b =>
-				{
-					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Alpha")
-						.WithMany()
-						.HasForeignKey("AlphaId");
-
-					b.HasOne("Tgstation.Server.Host.Models.ReattachInformation", "Bravo")
-						.WithMany()
-						.HasForeignKey("BravoId");
-
-					b.HasOne("Tgstation.Server.Host.Models.Instance", null)
-						.WithOne("WatchdogReattachInformation")
-						.HasForeignKey("Tgstation.Server.Host.Models.WatchdogReattachInformation", "InstanceId")
-						.OnDelete(DeleteBehavior.Cascade)
-						.IsRequired();
-				});
 #pragma warning restore 612, 618
 		}
 	}

src/Tgstation.Server.Host/Database/Migrations/PostgresSqlDatabaseContextModelSnapshot.cs

@@ -672,7 +672,7 @@ namespace Tgstation.Server.Host.Migrations
 					b.HasOne("Tgstation.Server.Host.Models.RevisionInformation", "RevisionInformation")
 						.WithMany("CompileJobs")
 						.HasForeignKey("RevisionInformationId")
-						.OnDelete(DeleteBehavior.ClientNoAction)
+						.OnDelete(DeleteBehavior.Cascade)
 						.IsRequired();
 				});
 

src/Tgstation.Server.Host/Database/MySqlDatabaseContext.cs

@@ -13,6 +13,9 @@ namespace Tgstation.Server.Host.Database
 	/// </summary>
 	sealed class MySqlDatabaseContext : DatabaseContext
 	{
+		/// <inheritdoc />
+		protected override DeleteBehavior RevInfoCompileJobDeleteBehavior => DeleteBehavior.Cascade;
+
 		/// <summary>
 		/// Construct a <see cref="MySqlDatabaseContext"/>
 		/// </summary>
@@ -39,9 +42,9 @@ namespace Tgstation.Server.Host.Database
 				{
 					mySqlOptions.EnableRetryOnFailure();
 
-					if (!String.IsNullOrEmpty(DatabaseConfiguration.MySqlServerVersion))
+					if (!String.IsNullOrEmpty(DatabaseConfiguration.ServerVersion))
 						mySqlOptions.ServerVersion(
-							Version.Parse(DatabaseConfiguration.MySqlServerVersion),
+							Version.Parse(DatabaseConfiguration.ServerVersion),
 							DatabaseConfiguration.DatabaseType == DatabaseType.MariaDB
 								? ServerType.MariaDb
 								: ServerType.MySql);

src/Tgstation.Server.Host/Database/PostgresSqlDatabaseContext.cs

@@ -2,7 +2,6 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System;
-using System.Diagnostics;
 using Tgstation.Server.Host.Configuration;
 
 namespace Tgstation.Server.Host.Database
@@ -12,6 +11,9 @@ namespace Tgstation.Server.Host.Database
 	/// </summary>
 	sealed class PostgresSqlDatabaseContext : DatabaseContext
 	{
+		/// <inheritdoc />
+		protected override DeleteBehavior RevInfoCompileJobDeleteBehavior => DeleteBehavior.Cascade;
+
 		/// <summary>
 		/// Construct a <see cref="SqlServerDatabaseContext"/>
 		/// </summary>
@@ -31,15 +33,19 @@ namespace Tgstation.Server.Host.Database
 		protected override void OnConfiguring(DbContextOptionsBuilder options)
 		{
 			base.OnConfiguring(options);
-			options.UseNpgsql(DatabaseConfiguration.ConnectionString, x => x.EnableRetryOnFailure());
+			options.UseNpgsql(DatabaseConfiguration.ConnectionString, options =>
+			{
+				options.EnableRetryOnFailure();
+
+				if (!String.IsNullOrEmpty(DatabaseConfiguration.ServerVersion))
+					options.SetPostgresVersion(
+						Version.Parse(DatabaseConfiguration.ServerVersion));
+			});
 		}
 
 		/// <inheritdoc />
 		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 PostgresSqlDatabaseContext!");
 		}

src/Tgstation.Server.Host/Models/Instance.cs

@@ -28,7 +28,7 @@ namespace Tgstation.Server.Host.Models
 		public RepositorySettings RepositorySettings { get; set; }
 
 		/// <summary>
-		/// The <see cref="Models.DualReattachInformation"/> for the <see cref="Instance"/>
+		/// The <see cref="DualReattachInformation"/> for the <see cref="Instance"/>
 		/// </summary>
 		public DualReattachInformation WatchdogReattachInformation { get; set; }
 
@@ -48,7 +48,7 @@ namespace Tgstation.Server.Host.Models
 		public List<RevisionInformation> RevisionInformations { get; set; }
 
 		/// <summary>
-		/// The <see cref="Jobs"/> in the <see cref="Instance"/>
+		/// The <see cref="Job"/>s in the <see cref="Instance"/>
 		/// </summary>
 		public List<Job> Jobs { get; set; }
 

src/Tgstation.Server.Host/ServerFactory.cs

@@ -73,7 +73,7 @@ namespace Tgstation.Server.Host
 						.UseIISIntegration()
 						.UseApplication(postSetupServices)
 						.SuppressStatusMessages(true)
-						.UseShutdownTimeout(TimeSpan.FromMinutes(1)));
+						.UseShutdownTimeout(TimeSpan.FromMilliseconds(postSetupServices.GeneralConfiguration.RestartTimeout)));
 
 			if (updatePath != null)
 				hostBuilder.UseContentRoot(

src/Tgstation.Server.Host/Setup/SetupWizard.cs

@@ -180,15 +180,25 @@ namespace Tgstation.Server.Host.Setup
 				await console.WriteAsync("Connection successful!", true, cancellationToken).ConfigureAwait(false);
 
 				if (databaseConfiguration.DatabaseType == DatabaseType.MariaDB
-					|| databaseConfiguration.DatabaseType == DatabaseType.MySql)
+					|| databaseConfiguration.DatabaseType == DatabaseType.MySql
+					|| databaseConfiguration.DatabaseType == DatabaseType.PostgresSql)
 				{
-					await console.WriteAsync("Checking MySQL/MariaDB version...", true, cancellationToken).ConfigureAwait(false);
+					await console.WriteAsync($"Checking {databaseConfiguration.DatabaseType} version...", true, cancellationToken).ConfigureAwait(false);
 					using var command = testConnection.CreateCommand();
 					command.CommandText = "SELECT VERSION()";
 					var fullVersion = (string)await command.ExecuteScalarAsync(cancellationToken).ConfigureAwait(false);
 					await console.WriteAsync(String.Format(CultureInfo.InvariantCulture, "Found {0}", fullVersion), true, cancellationToken).ConfigureAwait(false);
-					var splits = fullVersion.Split('-');
-					databaseConfiguration.MySqlServerVersion = splits.First();
+
+					if (databaseConfiguration.DatabaseType == DatabaseType.PostgresSql)
+					{
+						var splits = fullVersion.Split(' ');
+						databaseConfiguration.ServerVersion = splits[1].TrimEnd(',');
+					}
+					else
+					{
+						var splits = fullVersion.Split('-');
+						databaseConfiguration.ServerVersion = splits.First();
+					}
 				}
 
 				if (!isSqliteDB && !dbExists)
@@ -319,13 +329,11 @@ namespace Tgstation.Server.Host.Setup
 				await console.WriteAsync(
 					String.Format(
 						CultureInfo.InvariantCulture,
-						"Please enter one of {0}, {1}, {2}, or {3}: ",
+						"Please enter one of {0}, {1}, {2}, {3} or {4}: ",
 						DatabaseType.MariaDB,
 						DatabaseType.MySql,
-#pragma warning disable SA1515 // Single-line comment should be preceded by blank line
-						// DatabaseType.PostgresSql,
+						DatabaseType.PostgresSql,
 						DatabaseType.SqlServer,
-#pragma warning restore SA1515 // Single-line comment should be preceded by blank line
 						DatabaseType.Sqlite),
 					false,
 					cancellationToken)

src/Tgstation.Server.Host/Tgstation.Server.Host.csproj

@@ -67,7 +67,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.8" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.3" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
     <PackageReference Include="Octokit" Version="0.48.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
     <!-- If this is updated, be sure to update the reference in the README.md -->

src/Tgstation.Server.Host/appsettings.json

@@ -47,7 +47,7 @@
     "DropDatabase": false,
     "DatabaseType": "SqlServer",
     "ResetAdminPassword": false,
-    "MySqlServerVersion": null,
+    "ServerVersion": null,
     "ConnectionString": "Data Source=(local);Initial Catalog=TGS;Integrated Security=True"
   }
 }

tests/Tgstation.Server.Tests/IntegrationTest.cs

@@ -91,6 +91,11 @@ namespace Tgstation.Server.Tests
 					await serverTask.ConfigureAwait(false);
 				}
 				catch (OperationCanceledException) { }
+				catch (AggregateException ex)
+				{
+					if (ex.InnerException is NotSupportedException notSupportedException)
+						Assert.Inconclusive(notSupportedException.Message);
+				}
 			}
 			Assert.IsTrue(server.RestartRequested, "Server not requesting restart!");
 		}