From 86aba08289aad01cb32a83f4ce401aa34399a910 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Thu, 30 Oct 2014 22:26:48 -0700 Subject: [PATCH] Fixed broken migration 036 for people upgrading from very old DBs --- .../036_update_with_quality_converters.cs | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs index 842da1428..371d0e5df 100644 --- a/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs +++ b/src/NzbDrone.Core/Datastore/Migration/036_update_with_quality_converters.cs @@ -83,14 +83,18 @@ namespace NzbDrone.Core.Datastore.Migration { var qualityJson = qualityModelReader.GetString(0); - QualityModel036 quality; + SourceQualityModel036 sourceQuality; - if (!Json.TryDeserialize(qualityJson, out quality)) + if (!Json.TryDeserialize(qualityJson, out sourceQuality)) { continue; } - var qualityNewJson = qualityModelConverter.ToDB(quality); + var qualityNewJson = qualityModelConverter.ToDB(new DestinationQualityModel036 + { + Quality = sourceQuality.Quality.Id, + Proper = sourceQuality.Proper + }); using (IDbCommand updateCmd = conn.CreateCommand()) { @@ -106,10 +110,21 @@ namespace NzbDrone.Core.Datastore.Migration } } - private class QualityModel036 + private class DestinationQualityModel036 { public Int32 Quality { get; set; } public Boolean Proper { get; set; } } + + private class SourceQualityModel036 + { + public SourceQuality036 Quality { get; set; } + public Boolean Proper { get; set; } + } + + private class SourceQuality036 + { + public Int32 Id { get; set; } + } } }