From 5ee1077e1e89f5735d1d82fb4b66a2cfd0fbe057 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Tue, 2 May 2017 21:40:29 -0500 Subject: [PATCH] DB now stores Artists. DB schema may need small tweaks. --- .../Datastore/Migration/111_setup_music.cs | 29 +++++++++---------- src/NzbDrone.Core/Datastore/TableMapping.cs | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Migration/111_setup_music.cs b/src/NzbDrone.Core/Datastore/Migration/111_setup_music.cs index 0676eb4a9..faa998a0a 100644 --- a/src/NzbDrone.Core/Datastore/Migration/111_setup_music.cs +++ b/src/NzbDrone.Core/Datastore/Migration/111_setup_music.cs @@ -15,25 +15,24 @@ namespace NzbDrone.Core.Datastore.Migration Create.TableForModel("Artist") .WithColumn("ItunesId").AsInt32().Unique() .WithColumn("ArtistName").AsString().Unique() - .WithColumn("ArtistSlug").AsString().Unique() - .WithColumn("CleanTitle").AsString() // Do we need this? + .WithColumn("ArtistSlug").AsString().Nullable() //.Unique() + .WithColumn("CleanTitle").AsString().Nullable() // Do we need this? .WithColumn("Monitored").AsBoolean() - .WithColumn("AlbumFolder").AsBoolean() - .WithColumn("ArtistFolder").AsBoolean() + .WithColumn("AlbumFolder").AsBoolean().Nullable() + .WithColumn("ArtistFolder").AsBoolean().Nullable() .WithColumn("LastInfoSync").AsDateTime().Nullable() .WithColumn("LastDiskSync").AsDateTime().Nullable() - .WithColumn("Status").AsInt32() + .WithColumn("Status").AsInt32().Nullable() .WithColumn("Path").AsString() - .WithColumn("Images").AsString() - .WithColumn("QualityProfileId").AsInt32() - .WithColumn("RootFolderPath").AsString() - .WithColumn("Added").AsDateTime() - .WithColumn("ProfileId").AsInt32() // This is either ProfileId or Profile - .WithColumn("Genres").AsString() - .WithColumn("Albums").AsString() - .WithColumn("Tags").AsString() - .WithColumn("AddOptions").AsString() - + .WithColumn("Images").AsString().Nullable() + .WithColumn("QualityProfileId").AsInt32().Nullable() + .WithColumn("RootFolderPath").AsString().Nullable() + .WithColumn("Added").AsDateTime().Nullable() + .WithColumn("ProfileId").AsInt32().Nullable() // This is either ProfileId or Profile + .WithColumn("Genres").AsString().Nullable() + .WithColumn("Albums").AsString().Nullable() + .WithColumn("Tags").AsString().Nullable() + .WithColumn("AddOptions").AsString().Nullable() ; Create.TableForModel("Albums") diff --git a/src/NzbDrone.Core/Datastore/TableMapping.cs b/src/NzbDrone.Core/Datastore/TableMapping.cs index dcf8c0924..3d2594bef 100644 --- a/src/NzbDrone.Core/Datastore/TableMapping.cs +++ b/src/NzbDrone.Core/Datastore/TableMapping.cs @@ -95,7 +95,7 @@ namespace NzbDrone.Core.Datastore Mapper.Entity().RegisterModel("Artist") .Ignore(s => s.RootFolderPath) .Relationship() - .HasOne(s => s.Profile, s => s.ProfileId); + .HasOne(a => a.Profile, a => a.ProfileId); Mapper.Entity().RegisterModel("TrackFiles") .Ignore(f => f.Path)