From 0bbba82e8a580a5877a6e02ed1ee9006a112fa49 Mon Sep 17 00:00:00 2001 From: Spatison <137375981+Spatison@users.noreply.github.com> Date: Sun, 20 Apr 2025 00:51:00 +0300 Subject: [PATCH] Fix BD part 3 --- ...s => 20250419205006_ClownName.Designer.cs} | 16 ++++++++++--- ...ownName.cs => 20250419205006_ClownName.cs} | 4 ++-- .../PostgresServerDbContextModelSnapshot.cs | 24 +++++++++---------- ...s => 20250419204924_ClownName.Designer.cs} | 17 ++++++++++--- ...ownName.cs => 20250419204924_ClownName.cs} | 2 +- .../SqliteServerDbContextModelSnapshot.cs | 24 +++++++++---------- 6 files changed, 52 insertions(+), 35 deletions(-) rename Content.Server.Database/Migrations/Postgres/{20250419183117_ClownName.Designer.cs => 20250419205006_ClownName.Designer.cs} (99%) rename Content.Server.Database/Migrations/Postgres/{20250419183117_ClownName.cs => 20250419205006_ClownName.cs} (89%) rename Content.Server.Database/Migrations/Sqlite/{20250419183117_ClownName.Designer.cs => 20250419204924_ClownName.Designer.cs} (99%) rename Content.Server.Database/Migrations/Sqlite/{20250419183117_ClownName.cs => 20250419204924_ClownName.cs} (93%) diff --git a/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.Designer.cs b/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs similarity index 99% rename from Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.Designer.cs rename to Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs index d773a37ac5..089bfea0d4 100644 --- a/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.Designer.cs +++ b/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using System.Net; using System.Text.Json; @@ -15,7 +15,7 @@ using NpgsqlTypes; namespace Content.Server.Database.Migrations.Postgres { [DbContext(typeof(PostgresServerDbContext))] - [Migration("20250419183117_ClownName")] + [Migration("20250419205006_ClownName")] partial class ClownName { /// @@ -842,6 +842,11 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnType("text") .HasColumnName("backpack"); + b.Property("BodyType") + .IsRequired() + .HasColumnType("text") + .HasColumnName("body_type"); + b.Property("CharacterName") .IsRequired() .HasColumnType("text") @@ -853,7 +858,7 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("text") + .HasColumnType("TEXT") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -962,6 +967,11 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnType("text") .HasColumnName("station_ai_name"); + b.Property("Voice") + .IsRequired() + .HasColumnType("text") + .HasColumnName("voice"); + b.Property("Width") .HasColumnType("real") .HasColumnName("width"); diff --git a/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.cs b/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.cs similarity index 89% rename from Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.cs rename to Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.cs index 65946aef8f..39b05fc40b 100644 --- a/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.cs +++ b/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.cs @@ -1,4 +1,4 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable @@ -13,7 +13,7 @@ namespace Content.Server.Database.Migrations.Postgres migrationBuilder.AddColumn( name: "clown_name", table: "profile", - type: "text", + type: "TEXT", nullable: true); } diff --git a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs index 98a5bdd972..f189be2313 100644 --- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs @@ -839,6 +839,11 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnType("text") .HasColumnName("backpack"); + b.Property("BodyType") + .IsRequired() + .HasColumnType("text") + .HasColumnName("body_type"); + b.Property("CharacterName") .IsRequired() .HasColumnType("text") @@ -850,7 +855,7 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("text") + .HasColumnType("TEXT") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -937,18 +942,6 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnType("text") .HasColumnName("sex"); - // WD EDIT START - b.Property("Voice") - .IsRequired() - .HasColumnType("text") - .HasColumnName("voice"); - - b.Property("BodyType") - .IsRequired() - .HasColumnType("text") - .HasColumnName("body_type"); - // WD EDIT END - b.Property("SkinColor") .IsRequired() .HasColumnType("text") @@ -971,6 +964,11 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnType("text") .HasColumnName("station_ai_name"); + b.Property("Voice") + .IsRequired() + .HasColumnType("text") + .HasColumnName("voice"); + b.Property("Width") .HasColumnType("real") .HasColumnName("width"); diff --git a/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.Designer.cs similarity index 99% rename from Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs rename to Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.Designer.cs index d52f7501bd..0db70016e5 100644 --- a/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using Content.Server.Database; using Microsoft.EntityFrameworkCore; @@ -11,9 +11,10 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqliteServerDbContext))] - [Migration("20250419183117_ClownName")] + [Migration("20250419204924_ClownName")] partial class ClownName { + /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 @@ -790,6 +791,11 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnType("TEXT") .HasColumnName("backpack"); + b.Property("BodyType") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("body_type"); + b.Property("CharacterName") .IsRequired() .HasColumnType("TEXT") @@ -801,7 +807,7 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("text") + .HasColumnType("TEXT") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -910,6 +916,11 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnType("TEXT") .HasColumnName("station_ai_name"); + b.Property("Voice") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("voice"); + b.Property("Width") .HasColumnType("REAL") .HasColumnName("width"); diff --git a/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.cs b/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.cs similarity index 93% rename from Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.cs rename to Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.cs index e8611f00fc..cf226c710c 100644 --- a/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.cs +++ b/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.cs @@ -1,4 +1,4 @@ -using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Migrations; #nullable disable diff --git a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs index 6799ebab94..5c7748c71b 100644 --- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs @@ -788,6 +788,11 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnType("TEXT") .HasColumnName("backpack"); + b.Property("BodyType") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("body_type"); + b.Property("CharacterName") .IsRequired() .HasColumnType("TEXT") @@ -799,7 +804,7 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("text") + .HasColumnType("TEXT") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -886,18 +891,6 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnType("TEXT") .HasColumnName("sex"); - // WD EDIT START - b.Property("Voice") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("voice"); - - b.Property("BodyType") - .IsRequired() - .HasColumnType("TEXT") - .HasColumnName("body_type"); - // WD EDIT END - b.Property("SkinColor") .IsRequired() .HasColumnType("TEXT") @@ -920,6 +913,11 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnType("TEXT") .HasColumnName("station_ai_name"); + b.Property("Voice") + .IsRequired() + .HasColumnType("TEXT") + .HasColumnName("voice"); + b.Property("Width") .HasColumnType("REAL") .HasColumnName("width");