From 21e7986d3ee20ae81cb3802c64ee0826eac46fad Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Wed, 21 Jun 2023 22:21:50 -0400 Subject: [PATCH] Regenerate MapThreads migration as it has drifted --- ...0230622020600_MSAddMapThreads.Designer.cs} | 48 ++++++++++--------- ...s.cs => 20230622020600_MSAddMapThreads.cs} | 6 +-- ...0230622020623_MYAddMapThreads.Designer.cs} | 12 +++-- ...s.cs => 20230622020623_MYAddMapThreads.cs} | 6 +-- ...0230622020647_PGAddMapThreads.Designer.cs} | 12 +++-- ...s.cs => 20230622020647_PGAddMapThreads.cs} | 6 +-- ...0230622020712_SLAddMapThreads.Designer.cs} | 12 +++-- ...s.cs => 20230622020712_SLAddMapThreads.cs} | 6 +-- 8 files changed, 58 insertions(+), 50 deletions(-) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155515_MSAddMapThreads.Designer.cs => 20230622020600_MSAddMapThreads.Designer.cs} (97%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155515_MSAddMapThreads.cs => 20230622020600_MSAddMapThreads.cs} (79%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155613_MYAddMapThreads.Designer.cs => 20230622020623_MYAddMapThreads.Designer.cs} (98%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155613_MYAddMapThreads.cs => 20230622020623_MYAddMapThreads.cs} (79%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155714_PGAddMapThreads.Designer.cs => 20230622020647_PGAddMapThreads.Designer.cs} (98%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155714_PGAddMapThreads.cs => 20230622020647_PGAddMapThreads.cs} (79%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155832_SLAddMapThreads.Designer.cs => 20230622020712_SLAddMapThreads.Designer.cs} (98%) rename src/Tgstation.Server.Host/Database/Migrations/{20230427155832_SLAddMapThreads.cs => 20230622020712_SLAddMapThreads.cs} (79%) diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.Designer.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.Designer.cs similarity index 97% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.Designer.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.Designer.cs index 7aa73edf93..09c3484802 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.Designer.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { [DbContext(typeof(SqlServerDatabaseContext))] - [Migration("20230427155515_MSAddMapThreads")] + [Migration("20230622020600_MSAddMapThreads")] partial class MSAddMapThreads { /// @@ -18,10 +18,10 @@ namespace Tgstation.Server.Host.Database.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.15") + .HasAnnotation("ProductVersion", "7.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 128); - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1); + SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b => { @@ -29,7 +29,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ChannelLimit") .HasColumnType("int"); @@ -70,7 +70,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ChatSettingsId") .HasColumnType("bigint"); @@ -86,6 +86,10 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("bit"); + b.Property("IsSystemChannel") + .IsRequired() + .HasColumnType("bit"); + b.Property("IsUpdatesChannel") .IsRequired() .HasColumnType("bit"); @@ -117,7 +121,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ByondVersion") .IsRequired() @@ -180,7 +184,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AdditionalParameters") .IsRequired() @@ -195,11 +199,11 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("bit"); - b.Property("DumpOnHeartbeatRestart") + b.Property("DumpOnHealthCheckRestart") .IsRequired() .HasColumnType("bit"); - b.Property("HeartbeatSeconds") + b.Property("HealthCheckSeconds") .HasColumnType("bigint"); b.Property("InstanceId") @@ -245,7 +249,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ApiValidationPort") .HasColumnType("int"); @@ -282,7 +286,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AutoUpdateInterval") .HasColumnType("bigint"); @@ -324,7 +328,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ByondRights") .HasColumnType("decimal(20,0)"); @@ -369,7 +373,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("CancelRight") .HasColumnType("decimal(20,0)"); @@ -424,7 +428,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("ExternalUserId") .IsRequired() @@ -453,7 +457,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AdministrationRights") .HasColumnType("decimal(20,0)"); @@ -486,7 +490,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AccessIdentifier") .IsRequired() @@ -528,7 +532,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("AccessToken") .HasMaxLength(10000) @@ -593,7 +597,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("RevisionInformationId") .HasColumnType("bigint"); @@ -616,7 +620,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("CommitSha") .IsRequired() @@ -648,7 +652,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Author") .IsRequired() @@ -704,7 +708,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("CanonicalName") .IsRequired() @@ -762,7 +766,7 @@ namespace Tgstation.Server.Host.Database.Migrations .ValueGeneratedOnAdd() .HasColumnType("bigint"); - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"), 1L, 1); + SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); b.Property("Name") .IsRequired() diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.cs similarity index 79% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.cs index 23402c6864..dab10dc6af 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155515_MSAddMapThreads.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020600_MSAddMapThreads.cs @@ -14,8 +14,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.AddColumn( name: "MapThreads", @@ -28,8 +27,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.DropColumn( name: "MapThreads", diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.Designer.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.Designer.cs similarity index 98% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.Designer.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.Designer.cs index d7b2af8bd8..f7039334cf 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.Designer.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { [DbContext(typeof(MySqlDatabaseContext))] - [Migration("20230427155613_MYAddMapThreads")] + [Migration("20230622020623_MYAddMapThreads")] partial class MYAddMapThreads { /// @@ -18,7 +18,7 @@ namespace Tgstation.Server.Host.Database.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.15") + .HasAnnotation("ProductVersion", "7.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 64); modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b => @@ -86,6 +86,10 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("tinyint(1)"); + b.Property("IsSystemChannel") + .IsRequired() + .HasColumnType("tinyint(1)"); + b.Property("IsUpdatesChannel") .IsRequired() .HasColumnType("tinyint(1)"); @@ -201,11 +205,11 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("tinyint(1)"); - b.Property("DumpOnHeartbeatRestart") + b.Property("DumpOnHealthCheckRestart") .IsRequired() .HasColumnType("tinyint(1)"); - b.Property("HeartbeatSeconds") + b.Property("HealthCheckSeconds") .IsRequired() .HasColumnType("int unsigned"); diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.cs similarity index 79% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.cs index 9baac45b77..1f83abc44d 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155613_MYAddMapThreads.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020623_MYAddMapThreads.cs @@ -14,8 +14,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.AddColumn( name: "MapThreads", @@ -28,8 +27,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.DropColumn( name: "MapThreads", diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.Designer.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.Designer.cs similarity index 98% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.Designer.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.Designer.cs index 34d304edd8..6ef71f98ee 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.Designer.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.Designer.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { [DbContext(typeof(PostgresSqlDatabaseContext))] - [Migration("20230427155714_PGAddMapThreads")] + [Migration("20230622020647_PGAddMapThreads")] partial class PGAddMapThreads { /// @@ -18,7 +18,7 @@ namespace Tgstation.Server.Host.Database.Migrations { #pragma warning disable 612, 618 modelBuilder - .HasAnnotation("ProductVersion", "6.0.15") + .HasAnnotation("ProductVersion", "7.0.7") .HasAnnotation("Relational:MaxIdentifierLength", 63); NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); @@ -86,6 +86,10 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("boolean"); + b.Property("IsSystemChannel") + .IsRequired() + .HasColumnType("boolean"); + b.Property("IsUpdatesChannel") .IsRequired() .HasColumnType("boolean"); @@ -193,11 +197,11 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("boolean"); - b.Property("DumpOnHeartbeatRestart") + b.Property("DumpOnHealthCheckRestart") .IsRequired() .HasColumnType("boolean"); - b.Property("HeartbeatSeconds") + b.Property("HealthCheckSeconds") .HasColumnType("bigint"); b.Property("InstanceId") diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.cs similarity index 79% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.cs index 6b3d566450..1ff154f448 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155714_PGAddMapThreads.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020647_PGAddMapThreads.cs @@ -14,8 +14,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.AddColumn( name: "MapThreads", @@ -28,8 +27,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.DropColumn( name: "MapThreads", diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.Designer.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.Designer.cs similarity index 98% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.Designer.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.Designer.cs index 302dd6f7d1..0db22004a6 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.Designer.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.Designer.cs @@ -10,14 +10,14 @@ using Microsoft.EntityFrameworkCore.Migrations; namespace Tgstation.Server.Host.Database.Migrations { [DbContext(typeof(SqliteDatabaseContext))] - [Migration("20230427155832_SLAddMapThreads")] + [Migration("20230622020712_SLAddMapThreads")] partial class SLAddMapThreads { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 - modelBuilder.HasAnnotation("ProductVersion", "6.0.15"); + modelBuilder.HasAnnotation("ProductVersion", "7.0.7"); modelBuilder.Entity("Tgstation.Server.Host.Models.ChatBot", b => { @@ -80,6 +80,10 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("INTEGER"); + b.Property("IsSystemChannel") + .IsRequired() + .HasColumnType("INTEGER"); + b.Property("IsUpdatesChannel") .IsRequired() .HasColumnType("INTEGER"); @@ -183,11 +187,11 @@ namespace Tgstation.Server.Host.Database.Migrations .IsRequired() .HasColumnType("INTEGER"); - b.Property("DumpOnHeartbeatRestart") + b.Property("DumpOnHealthCheckRestart") .IsRequired() .HasColumnType("INTEGER"); - b.Property("HeartbeatSeconds") + b.Property("HealthCheckSeconds") .IsRequired() .HasColumnType("INTEGER"); diff --git a/src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.cs b/src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.cs similarity index 79% rename from src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.cs rename to src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.cs index 0b6e6b2272..218c9d7d4b 100644 --- a/src/Tgstation.Server.Host/Database/Migrations/20230427155832_SLAddMapThreads.cs +++ b/src/Tgstation.Server.Host/Database/Migrations/20230622020712_SLAddMapThreads.cs @@ -14,8 +14,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Up(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.AddColumn( name: "MapThreads", @@ -28,8 +27,7 @@ namespace Tgstation.Server.Host.Database.Migrations /// protected override void Down(MigrationBuilder migrationBuilder) { - if (migrationBuilder == null) - throw new ArgumentNullException(nameof(migrationBuilder)); + ArgumentNullException.ThrowIfNull(migrationBuilder); migrationBuilder.DropColumn( name: "MapThreads",