From 5d167b49a4f451b778a419b28fb4f2a8df70b094 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 27 Nov 2018 15:09:08 +0100
Subject: [PATCH] More composition fixes

---
 src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs          | 1 +
 .../Migrations/Upgrade/V_8_0_0/DropTaskTables.cs            | 6 +++---
 .../Migrations/Upgrade/V_8_0_0/RefactorVariantsModel.cs     | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
index ec49544976..53a86f3524 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
@@ -144,6 +144,7 @@ namespace Umbraco.Core.Migrations.Upgrade
             Chain<TagsMigrationFix>("{EE429F1B-9B26-43CA-89F8-A86017C809A3}");
             Chain<DropTemplateDesignColumn>("{08919C4B-B431-449C-90EC-2B8445B5C6B1}");
             Chain<TablesForScheduledPublishing>("{7EB0254C-CB8B-4C75-B15B-D48C55B449EB}");
+            Chain<DropTaskTables>("{648A2D5F-7467-48F8-B309-E99CEEE00E2A}"); // fixed version
 
             //FINAL
 
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
index e8fd4f409e..008b3e4b5f 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/DropTaskTables.cs
@@ -9,10 +9,10 @@
 
         public override void Migrate()
         {
-            if (TableExists("cmsTaskType"))
-                Delete.Table("cmsTaskType");
             if (TableExists("cmsTask"))
-                Delete.Table("cmsTask");
+                Delete.Table("cmsTask").Do();
+            if (TableExists("cmsTaskType"))
+                Delete.Table("cmsTaskType").Do();
         }
     }
 }
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorVariantsModel.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorVariantsModel.cs
index aa498583ff..6ddd49841d 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorVariantsModel.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorVariantsModel.cs
@@ -11,7 +11,8 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
 
         public override void Migrate()
         {
-            Delete.Column("edited").FromTable(Constants.DatabaseSchema.Tables.ContentVersionCultureVariation).Do();
+            if (ColumnExists(Constants.DatabaseSchema.Tables.ContentVersionCultureVariation, "edited"))
+                Delete.Column("edited").FromTable(Constants.DatabaseSchema.Tables.ContentVersionCultureVariation).Do();
 
 
             // add available column