From 6baea68a7d5e8320037c10cfc5110ac56be926cd Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Wed, 8 May 2019 07:53:11 +0200
Subject: [PATCH 1/2] Fix duplicate alias exception in "convert media URLs"
 migration

---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index ab8e1cd4d6..c5325574a9 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -27,7 +27,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
 
             var sqlPropertyData = Sql()
                 .Select<PropertyDataDto>()
-                    .AndSelect<PropertyTypeDto>()
+                    .AndSelect<PropertyTypeDto>(x => x.Alias)
                     .AndSelect<DataTypeDto>()
                 .From<PropertyDataDto>()
                     .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)

From 6cf82669fbe18f49f1e2d878b55e301f7c1abb7c Mon Sep 17 00:00:00 2001
From: Rasmus John Pedersen <mail@rjp.dk>
Date: Wed, 8 May 2019 10:52:05 +0200
Subject: [PATCH 2/2] Update media urls migration to only fetch/update needed
 fields from db

---
 .../V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
index c5325574a9..50c7daf65d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_1_0/ConvertTinyMceAndGridMediaUrlsToLocalLink.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Newtonsoft.Json;
@@ -26,9 +26,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                 RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace);
 
             var sqlPropertyData = Sql()
-                .Select<PropertyDataDto>()
-                    .AndSelect<PropertyTypeDto>(x => x.Alias)
-                    .AndSelect<DataTypeDto>()
+                .Select<PropertyDataDto>(x => x.Id, x => x.TextValue)
+                    .AndSelect<DataTypeDto>(x => x.EditorAlias)
                 .From<PropertyDataDto>()
                     .InnerJoin<PropertyTypeDto>().On<PropertyDataDto, PropertyTypeDto>((left, right) => left.PropertyTypeId == right.Id)
                     .InnerJoin<DataTypeDto>().On<PropertyTypeDto, DataTypeDto>((left, right) => left.DataTypeId == right.NodeId)
@@ -64,7 +63,7 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_1_0
                     property.TextValue = UpdateMediaUrls(mediaLinkPattern, value);
                 }
 
-                Database.Update(property);
+                Database.Update(property, x => x.TextValue);
             }
 
             Context.AddPostMigration<RebuildPublishedSnapshot>();