From 891bea81bff8950ae434f2c8defe08751eb98924 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 30 Oct 2017 23:24:28 +1100
Subject: [PATCH] bumps version and updates DatabaseSchemaResult to check for
 cmsMedia table, fixes the bulk insert logic to ignore result columns

---
 src/SolutionInfo.cs                                       | 4 ++--
 src/Umbraco.Core/Configuration/UmbracoVersion.cs          | 2 +-
 src/Umbraco.Core/Models/Rdbms/MediaDto.cs                 | 6 +++---
 .../Migrations/Initial/DatabaseSchemaResult.cs            | 6 ++++++
 src/Umbraco.Core/Persistence/PocoDataDataReader.cs        | 8 ++++++--
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                  | 4 ++--
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index e46b9f2d3c..77adcb9c8e 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -11,5 +11,5 @@ using System.Resources;
 
 [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyFileVersion("7.7.4")]
-[assembly: AssemblyInformationalVersion("7.7.4")]
\ No newline at end of file
+[assembly: AssemblyFileVersion("7.8.0")]
+[assembly: AssemblyInformationalVersion("7.8.0")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 43bfbc64a0..178429d479 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.Configuration
 {
     public class UmbracoVersion
     {
-        private static readonly Version Version = new Version("7.7.4");
+        private static readonly Version Version = new Version("7.8.0");
 
         /// <summary>
         /// Gets the current version of Umbraco.
diff --git a/src/Umbraco.Core/Models/Rdbms/MediaDto.cs b/src/Umbraco.Core/Models/Rdbms/MediaDto.cs
index a25c060944..799a9ab4b9 100644
--- a/src/Umbraco.Core/Models/Rdbms/MediaDto.cs
+++ b/src/Umbraco.Core/Models/Rdbms/MediaDto.cs
@@ -19,11 +19,11 @@ namespace Umbraco.Core.Models.Rdbms
         [PrimaryKeyColumn(AutoIncrement = false)]
         public Guid VersionId { get; set; }
         
-        [ResultColumn]
-        public ContentVersionDto ContentVersionDto { get; set; }
-
         [Column("mediaPath")]
         [NullSetting(NullSetting = NullSettings.Null)]
         public string MediaPath { get; set; }
+
+        [ResultColumn]
+        public ContentVersionDto ContentVersionDto { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
index c11c413f56..cd2426357d 100644
--- a/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
+++ b/src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaResult.cs
@@ -148,6 +148,12 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                 return new Version(7, 6, 0);
             }
 
+            //if the error is for cmsMedia it must be the previous version to 7.8 since that is when it is added
+            if (Errors.Any(x => x.Item1.Equals("Table") && (x.Item2.InvariantEquals("cmsMedia"))))
+            {
+                return new Version(7, 7, 0);
+            }
+
             return UmbracoVersion.Current;
         }
 
diff --git a/src/Umbraco.Core/Persistence/PocoDataDataReader.cs b/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
index b0479a311a..4dac6f5004 100644
--- a/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
+++ b/src/Umbraco.Core/Persistence/PocoDataDataReader.cs
@@ -38,8 +38,12 @@ namespace Umbraco.Core.Persistence
 
             _tableDefinition = DefinitionFactory.GetTableDefinition(sqlSyntaxProvider, pd.type);
             if (_tableDefinition == null) throw new InvalidOperationException("No table definition found for type " + pd.type);
-            
-            _readerColumns = pd.Columns.Select(x => x.Value).ToArray();
+
+            //Only return real columns, do not include columns that are result columns
+            _readerColumns = pd.Columns
+                .Where(x => x.Value.ResultColumn == false)
+                .Select(x => x.Value)
+                .ToArray();
             _sqlSyntaxProvider = sqlSyntaxProvider;
             _enumerator = dataSource.GetEnumerator();
             _columnDefinitions = _tableDefinition.Columns.ToArray();
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index dd6e0841cf..96564b2801 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -1026,9 +1026,9 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
         <WebProjectProperties>
           <UseIIS>True</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7740</DevelopmentServerPort>
+          <DevelopmentServerPort>7800</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:7740</IISUrl>
+          <IISUrl>http://localhost:7800</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>