From 58293c3eae6189fd8d29d88a48022d539e3bf960 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Fri, 30 Nov 2018 16:35:57 +0900 Subject: [PATCH] Re-migrate --- ...> 20181130071705_AddScoreInfoTables.Designer.cs} | 13 ++++++++----- ...bles.cs => 20181130071705_AddScoreInfoTables.cs} | 6 +++--- osu.Game/Migrations/OsuDbContextModelSnapshot.cs | 11 +++++++---- 3 files changed, 18 insertions(+), 12 deletions(-) rename osu.Game/Migrations/{20181130052804_AddScoreInfoTables.Designer.cs => 20181130071705_AddScoreInfoTables.Designer.cs} (97%) rename osu.Game/Migrations/{20181130052804_AddScoreInfoTables.cs => 20181130071705_AddScoreInfoTables.cs} (95%) diff --git a/osu.Game/Migrations/20181130052804_AddScoreInfoTables.Designer.cs b/osu.Game/Migrations/20181130071705_AddScoreInfoTables.Designer.cs similarity index 97% rename from osu.Game/Migrations/20181130052804_AddScoreInfoTables.Designer.cs rename to osu.Game/Migrations/20181130071705_AddScoreInfoTables.Designer.cs index 273c4fbdaa..25c475d64e 100644 --- a/osu.Game/Migrations/20181130052804_AddScoreInfoTables.Designer.cs +++ b/osu.Game/Migrations/20181130071705_AddScoreInfoTables.Designer.cs @@ -9,7 +9,7 @@ using osu.Game.Database; namespace osu.Game.Migrations { [DbContext(typeof(OsuDbContext))] - [Migration("20181130052804_AddScoreInfoTables")] + [Migration("20181130071705_AddScoreInfoTables")] partial class AddScoreInfoTables { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -325,7 +325,8 @@ namespace osu.Game.Migrations b.Property("MaxCombo"); - b.Property("ModsString"); + b.Property("ModsJson") + .HasColumnName("Mods"); b.Property("OnlineScoreID"); @@ -335,11 +336,13 @@ namespace osu.Game.Migrations b.Property("RulesetID"); - b.Property("StatisticsString"); + b.Property("StatisticsJson") + .HasColumnName("Statistics"); b.Property("TotalScore"); - b.Property("UserString"); + b.Property("UserString") + .HasColumnName("User"); b.HasKey("ID"); @@ -446,7 +449,7 @@ namespace osu.Game.Migrations modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b => { - b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "BeatmapInfo") + b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap") .WithMany() .HasForeignKey("BeatmapInfoID") .OnDelete(DeleteBehavior.Cascade); diff --git a/osu.Game/Migrations/20181130052804_AddScoreInfoTables.cs b/osu.Game/Migrations/20181130071705_AddScoreInfoTables.cs similarity index 95% rename from osu.Game/Migrations/20181130052804_AddScoreInfoTables.cs rename to osu.Game/Migrations/20181130071705_AddScoreInfoTables.cs index 470f541c32..48927cd86e 100644 --- a/osu.Game/Migrations/20181130052804_AddScoreInfoTables.cs +++ b/osu.Game/Migrations/20181130071705_AddScoreInfoTables.cs @@ -21,12 +21,12 @@ namespace osu.Game.Migrations MaxCombo = table.Column(nullable: false), Combo = table.Column(nullable: false), RulesetID = table.Column(nullable: false), - ModsString = table.Column(nullable: true), - UserString = table.Column(nullable: true), + Mods = table.Column(nullable: true), + User = table.Column(nullable: true), BeatmapInfoID = table.Column(nullable: false), OnlineScoreID = table.Column(nullable: true), Date = table.Column(nullable: false), - StatisticsString = table.Column(nullable: true), + Statistics = table.Column(nullable: true), MD5Hash = table.Column(nullable: true), DeletePending = table.Column(nullable: false) }, diff --git a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs index c44fdcf8dd..abd6c43499 100644 --- a/osu.Game/Migrations/OsuDbContextModelSnapshot.cs +++ b/osu.Game/Migrations/OsuDbContextModelSnapshot.cs @@ -323,7 +323,8 @@ namespace osu.Game.Migrations b.Property("MaxCombo"); - b.Property("ModsString"); + b.Property("ModsJson") + .HasColumnName("Mods"); b.Property("OnlineScoreID"); @@ -333,11 +334,13 @@ namespace osu.Game.Migrations b.Property("RulesetID"); - b.Property("StatisticsString"); + b.Property("StatisticsJson") + .HasColumnName("Statistics"); b.Property("TotalScore"); - b.Property("UserString"); + b.Property("UserString") + .HasColumnName("User"); b.HasKey("ID"); @@ -444,7 +447,7 @@ namespace osu.Game.Migrations modelBuilder.Entity("osu.Game.Scoring.ScoreInfo", b => { - b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "BeatmapInfo") + b.HasOne("osu.Game.Beatmaps.BeatmapInfo", "Beatmap") .WithMany() .HasForeignKey("BeatmapInfoID") .OnDelete(DeleteBehavior.Cascade);