From ee693b63bd0e172e45621a357c280af6cee0b3aa Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 29 Jan 2019 17:52:48 +1100 Subject: [PATCH] Fixes issue with ConvertRelatedLinksToMultiUrlPicker migration since it produces invalid SQL if there are no values in the .Contains calls --- .../V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs index 7e7f398791..6a22451c0a 100644 --- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs +++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs @@ -26,12 +26,16 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 var dataTypes = Database.Fetch(sqlDataTypes); var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList(); + if (dataTypeIds.Count == 0) return; + var sqlPropertyTpes = Sql() .Select() .From() .Where(x => dataTypeIds.Contains(x.DataTypeId)); - var propertyTypeIds = Database.Fetch(sqlPropertyTpes).Select(x => x.Id); + var propertyTypeIds = Database.Fetch(sqlPropertyTpes).Select(x => x.Id).ToList(); + + if (propertyTypeIds.Count == 0) return; var sqlPropertyData = Sql() .Select() @@ -41,7 +45,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0 var properties = Database.Fetch(sqlPropertyData); // Create a Multi URL Picker datatype for the converted RelatedLinks data - if (properties.Any() == false) + if (!properties.Any()) return; foreach (var property in properties)