yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes issue with ConvertRelatedLinksToMultiUrlPicker migration since it produces invalid SQL if there are no values in the .Contains calls

Browse Source
This commit is contained in:
Shannon
2019-01-29 17:52:48 +11:00
parent c2f51be0a1
commit ee693b63bd
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/ConvertRelatedLinksToMultiUrlPicker.cs
View File

@@ -26,12 +26,16 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
var dataTypes = Database.Fetch<DataTypeDto>(sqlDataTypes);
var dataTypeIds = dataTypes.Select(x => x.NodeId).ToList();
if (dataTypeIds.Count == 0) return;
var sqlPropertyTpes = Sql()
.Select<PropertyTypeDto>()
.From<PropertyTypeDto>()
.Where<PropertyTypeDto>(x => dataTypeIds.Contains(x.DataTypeId));
var propertyTypeIds = Database.Fetch<PropertyTypeDto>(sqlPropertyTpes).Select(x => x.Id);
var propertyTypeIds = Database.Fetch<PropertyTypeDto>(sqlPropertyTpes).Select(x => x.Id).ToList();
if (propertyTypeIds.Count == 0) return;
var sqlPropertyData = Sql()
.Select<PropertyDataDto>()
@@ -41,7 +45,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
var properties = Database.Fetch<PropertyDataDto>(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)