From 3deb00ccb12dbc363ccede6721cfbe8c3f5daee4 Mon Sep 17 00:00:00 2001 From: Remuchi Date: Sun, 20 Apr 2025 11:34:29 +0700 Subject: [PATCH] Revert "Fix BD part 3" This reverts commit 0bbba82e8a580a5877a6e02ed1ee9006a112fa49. --- ...s => 20250419183117_ClownName.Designer.cs} | 16 +++---------- ...ownName.cs => 20250419183117_ClownName.cs} | 4 ++-- .../PostgresServerDbContextModelSnapshot.cs | 24 ++++++++++--------- ...s => 20250419183117_ClownName.Designer.cs} | 17 +++---------- ...ownName.cs => 20250419183117_ClownName.cs} | 2 +- .../SqliteServerDbContextModelSnapshot.cs | 24 ++++++++++--------- 6 files changed, 35 insertions(+), 52 deletions(-) rename Content.Server.Database/Migrations/Postgres/{20250419205006_ClownName.Designer.cs => 20250419183117_ClownName.Designer.cs} (99%) rename Content.Server.Database/Migrations/Postgres/{20250419205006_ClownName.cs => 20250419183117_ClownName.cs} (89%) rename Content.Server.Database/Migrations/Sqlite/{20250419204924_ClownName.Designer.cs => 20250419183117_ClownName.Designer.cs} (99%) rename Content.Server.Database/Migrations/Sqlite/{20250419204924_ClownName.cs => 20250419183117_ClownName.cs} (93%) diff --git a/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs b/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.Designer.cs similarity index 99% rename from Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs rename to Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.Designer.cs index 089bfea0d4..d773a37ac5 100644 --- a/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.Designer.cs +++ b/Content.Server.Database/Migrations/Postgres/20250419183117_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("20250419205006_ClownName")] + [Migration("20250419183117_ClownName")] partial class ClownName { /// @@ -842,11 +842,6 @@ 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") @@ -858,7 +853,7 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("TEXT") + .HasColumnType("text") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -967,11 +962,6 @@ 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/20250419205006_ClownName.cs b/Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.cs similarity index 89% rename from Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.cs rename to Content.Server.Database/Migrations/Postgres/20250419183117_ClownName.cs index 39b05fc40b..65946aef8f 100644 --- a/Content.Server.Database/Migrations/Postgres/20250419205006_ClownName.cs +++ b/Content.Server.Database/Migrations/Postgres/20250419183117_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 f189be2313..98a5bdd972 100644 --- a/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Postgres/PostgresServerDbContextModelSnapshot.cs @@ -839,11 +839,6 @@ 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") @@ -855,7 +850,7 @@ namespace Content.Server.Database.Migrations.Postgres .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("TEXT") + .HasColumnType("text") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -942,6 +937,18 @@ 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") @@ -964,11 +971,6 @@ 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/20250419204924_ClownName.Designer.cs b/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs similarity index 99% rename from Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.Designer.cs rename to Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs index 0db70016e5..d52f7501bd 100644 --- a/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.Designer.cs +++ b/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.Designer.cs @@ -1,4 +1,4 @@ -// +// using System; using Content.Server.Database; using Microsoft.EntityFrameworkCore; @@ -11,10 +11,9 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace Content.Server.Database.Migrations.Sqlite { [DbContext(typeof(SqliteServerDbContext))] - [Migration("20250419204924_ClownName")] + [Migration("20250419183117_ClownName")] partial class ClownName { - /// protected override void BuildTargetModel(ModelBuilder modelBuilder) { #pragma warning disable 612, 618 @@ -791,11 +790,6 @@ 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") @@ -807,7 +801,7 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("TEXT") + .HasColumnType("text") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -916,11 +910,6 @@ 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/20250419204924_ClownName.cs b/Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.cs similarity index 93% rename from Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.cs rename to Content.Server.Database/Migrations/Sqlite/20250419183117_ClownName.cs index cf226c710c..e8611f00fc 100644 --- a/Content.Server.Database/Migrations/Sqlite/20250419204924_ClownName.cs +++ b/Content.Server.Database/Migrations/Sqlite/20250419183117_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 5c7748c71b..6799ebab94 100644 --- a/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs +++ b/Content.Server.Database/Migrations/Sqlite/SqliteServerDbContextModelSnapshot.cs @@ -788,11 +788,6 @@ 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") @@ -804,7 +799,7 @@ namespace Content.Server.Database.Migrations.Sqlite .HasColumnName("clothing"); b.Property("ClownName") - .HasColumnType("TEXT") + .HasColumnType("text") .HasColumnName("clown_name"); b.Property("CustomSpecieName") @@ -891,6 +886,18 @@ 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") @@ -913,11 +920,6 @@ 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");