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

Fixes related links data upgrader when there invalid old data stored (U4-4133)

Browse Source
This commit is contained in:
Shannon
2014-10-16 12:01:08 +10:00
parent 7b99efb061
commit cab8ea86fb
1 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
View File

@@ -36,10 +36,19 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
database.Fetch<PropertyDataDto>(
"WHERE propertyTypeId in (SELECT id from cmsPropertyType where dataTypeID IN (@dataTypeIds))", new { dataTypeIds = dataTypeIds });
if (!propertyData.Any()) return string.Empty;
var nodesIdsWithProperty = propertyData.Select(x => x.NodeId).Distinct();
var cmsContentXmlEntries = database.Fetch<ContentXmlDto>(
"WHERE nodeId in (@nodeIds)", new { nodeIds = nodesIdsWithProperty });
var nodesIdsWithProperty = propertyData.Select(x => x.NodeId).Distinct().ToArray();
var cmsContentXmlEntries = new List<ContentXmlDto>();
//We're doing an "IN" query here but SQL server only supports 2100 query parameters so we're going to split on that
// It would be better to do this as an INNER join + sub query but I don't have time for that at the moment and this is only run once
// so it's not a big deal.
var batches = nodesIdsWithProperty.InGroupsOf(2000);
foreach (var batch in batches)
{
cmsContentXmlEntries.AddRange(database.Fetch<ContentXmlDto>("WHERE nodeId in (@nodeIds)", new { nodeIds = batch }));
}
var propertyTypeIds = propertyData.Select(x => x.PropertyTypeId).Distinct();
var propertyTypes = database.Fetch<PropertyTypeDto>(
"WHERE id in (@propertyTypeIds)", new { propertyTypeIds = propertyTypeIds });
@@ -48,9 +57,25 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
if (string.IsNullOrEmpty(data.Text) == false)
{
XmlDocument xml;
//fetch the current data (that's in xml format)
var xml = new XmlDocument();
xml.LoadXml(data.Text);
try
{
xml = new XmlDocument();
xml.LoadXml(data.Text);
}
catch (Exception ex)
{
LogHelper.Error<UpdateRelatedLinksData>("The data stored for property id " + data.Id + " on document " + data.NodeId +
" is not valid XML, the data will be removed because it cannot be converted to the new format. The value was: " + data.Text, ex);
data.Text = "";
database.Update(data);
UpdateXmlTable(propertyTypes, data, cmsContentXmlEntries, database);
continue;
}
var links = new List<ExpandoObject>();
@@ -82,23 +107,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
database.Update(data);
//now we need to update the cmsContentXml table
var propertyType = propertyTypes.SingleOrDefault(x => x.Id == data.PropertyTypeId);
if (propertyType != null)
{
var xmlItem = cmsContentXmlEntries.SingleOrDefault(x => x.NodeId == data.NodeId);
if (xmlItem != null)
{
var x = XElement.Parse(xmlItem.Xml);
var prop = x.Element(propertyType.Alias);
if (prop != null)
{
prop.ReplaceAll(new XCData(data.Text));
database.Update(xmlItem);
}
}
}
UpdateXmlTable(propertyTypes, data, cmsContentXmlEntries, database);
}
}
@@ -110,5 +119,25 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
{
throw new DataLossException("Cannot downgrade from a version 7 database to a prior version, the database schema has already been modified");
}
private static void UpdateXmlTable(List<PropertyTypeDto> propertyTypes, PropertyDataDto data, List<ContentXmlDto> cmsContentXmlEntries, Database database)
{
//now we need to update the cmsContentXml table
var propertyType = propertyTypes.SingleOrDefault(x => x.Id == data.PropertyTypeId);
if (propertyType != null)
{
var xmlItem = cmsContentXmlEntries.SingleOrDefault(x => x.NodeId == data.NodeId);
if (xmlItem != null)
{
var x = XElement.Parse(xmlItem.Xml);
var prop = x.Element(propertyType.Alias);
if (prop != null)
{
prop.ReplaceAll(new XCData(data.Text));
database.Update(xmlItem);
}
}
}
}
}
}