Testing the arrows for expanding and collapsing a tree

src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs

@@ -6,17 +6,17 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
     {
         public ConstraintDefinition(ConstraintType type)
         {
-            _constraintType = type;
+            constraintType = type;
         }
 
-        private readonly ConstraintType _constraintType;
-        public bool IsPrimaryKeyConstraint => ConstraintType.PrimaryKey == _constraintType;
-        public bool IsUniqueConstraint => ConstraintType.Unique == _constraintType;
-        public bool IsNonUniqueConstraint => ConstraintType.NonUnique == _constraintType;
+        private ConstraintType constraintType;
+        public bool IsPrimaryKeyConstraint { get { return ConstraintType.PrimaryKey == constraintType; } }
+        public bool IsUniqueConstraint { get { return ConstraintType.Unique == constraintType; } }
+        public bool IsNonUniqueConstraint { get { return ConstraintType.NonUnique == constraintType; } }
 
         public string SchemaName { get; set; }
         public string ConstraintName { get; set; }
         public string TableName { get; set; }
         public ICollection<string> Columns = new HashSet<string>();
     }
-}
+}

src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DbIndexDefinition.cs

@@ -1,5 +1,3 @@
-using System;
-
 namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
 {
     /// <summary>
@@ -7,17 +5,9 @@ namespace Umbraco.Core.Persistence.DatabaseModelDefinitions
     /// </summary>
     internal class DbIndexDefinition
     {
-        public DbIndexDefinition(Tuple<string, string, string, bool> data)
-        {
-            TableName = data.Item1;
-            IndexName = data.Item2;
-            ColumnName = data.Item3;
-            IsUnique = data.Item4;
-        }
-
-        public string IndexName { get; }
-        public string TableName { get; }
-        public string ColumnName { get; }
-        public bool IsUnique { get; }
+        public virtual string IndexName { get; set; }
+        public virtual string TableName { get; set; }
+        public virtual string ColumnName { get; set; }
+        public virtual bool IsUnique { get; set; }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs

@@ -159,7 +159,13 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
 
             //get the db index defs
             result.DbIndexDefinitions = _sqlSyntaxProvider.GetDefinedIndexes(_database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             foreach (var item in OrderedTables.OrderBy(x => x.Key))
             {
@@ -178,14 +184,6 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             return result;
         }
 
-        /// <summary>
-        /// This validates the Primary/Foreign keys in the database
-        /// </summary>
-        /// <param name="result"></param>
-        /// <remarks>
-        /// This does not validate any database constraints that are not PKs or FKs because Umbraco does not create a database with non PK/FK contraints.
-        /// Any unique "constraints" in the database are done with unique indexes.
-        /// </remarks>
         private void ValidateDbConstraints(DatabaseSchemaResult result)
         {
             //MySql doesn't conform to the "normal" naming of constraints, so there is currently no point in doing these checks.
@@ -198,7 +196,8 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             var constraintsInDatabase = _sqlSyntaxProvider.GetConstraintsPerColumn(_database).DistinctBy(x => x.Item3).ToList();
             var foreignKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("FK_")).Select(x => x.Item3).ToList();
             var primaryKeysInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("PK_")).Select(x => x.Item3).ToList();
-
+            var indexesInDatabase = constraintsInDatabase.Where(x => x.Item3.InvariantStartsWith("IX_")).Select(x => x.Item3).ToList();
+            var indexesInSchema = result.TableDefinitions.SelectMany(x => x.Indexes.Select(y => y.Name)).ToList();
             var unknownConstraintsInDatabase =
                 constraintsInDatabase.Where(
                     x =>
@@ -213,7 +212,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
             // In theory you could have: FK_ or fk_ ...or really any standard that your development department (or developer) chooses to use.
             foreach (var unknown in unknownConstraintsInDatabase)
             {
-                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown))
+                if (foreignKeysInSchema.InvariantContains(unknown) || primaryKeysInSchema.InvariantContains(unknown) || indexesInSchema.InvariantContains(unknown))
                 {
                     result.ValidConstraints.Add(unknown);
                 }
@@ -255,6 +254,23 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
                 result.Errors.Add(new Tuple<string, string>("Constraint", primaryKey));
             }
 
+            //Constaints:
+
+            //NOTE: SD: The colIndex checks above should really take care of this but I need to keep this here because it was here before
+            // and some schema validation checks might rely on this data remaining here!
+            //Add valid and invalid index differences to the result object
+            var validIndexDifferences = indexesInDatabase.Intersect(indexesInSchema, StringComparer.InvariantCultureIgnoreCase);
+            foreach (var index in validIndexDifferences)
+            {
+                result.ValidConstraints.Add(index);
+            }
+            var invalidIndexDifferences =
+                indexesInDatabase.Except(indexesInSchema, StringComparer.InvariantCultureIgnoreCase)
+                                .Union(indexesInSchema.Except(indexesInDatabase, StringComparer.InvariantCultureIgnoreCase));
+            foreach (var index in invalidIndexDifferences)
+            {
+                result.Errors.Add(new Tuple<string, string>("Constraint", index));
+            }
         }
 
         private void ValidateDbColumns(DatabaseSchemaResult result)

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs

@@ -28,7 +28,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
         public override void Up()
         {
             var dbIndexes = _skipIndexCheck ? new DbIndexDefinition[]{} : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             //make sure it doesn't already exist
             if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacroProperty_Alias")) == false)
@@ -48,4 +54,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
             Delete.Index("IX_cmsMacroProperty_Alias").OnTable("cmsMacroProperty");
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs

@@ -30,7 +30,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
         public override void Up()
         {
             var dbIndexes = _forTesting ? new DbIndexDefinition[] { } : SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             //make sure it doesn't already exist
             if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsMacro_Alias")) == false)
@@ -69,4 +75,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
             Delete.Index("IX_cmsMacro_Alias").OnTable("cmsMacro");
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs

@@ -18,7 +18,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
         public override void Up()
         {
             var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
             
             //add a foreign key to the parent id column too!
 
@@ -48,4 +54,4 @@ 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");
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AssignMissingKeysAndIndexes.cs

@@ -26,7 +26,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
             // it is absolutely required to exist in order to have it as a foreign key reference, so we'll need to check it's existence
             // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
             var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
             if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContent")) == false)
             {
                 Create.Index("IX_cmsContent").OnTable("cmsContent").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -89,4 +95,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven
             //don't do anything, these keys should have always existed!
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddIndexToPropertyTypeAliasColumn.cs

@@ -15,7 +15,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenEightZe
         {
             Execute.Code(database =>
             {                
-                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(database);
+                var dbIndexes = SqlSyntax.GetDefinedIndexesDefinitions(Context.Database);
 
                 //make sure it doesn't already exist
                 if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsPropertyTypeAlias")) == false)

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs

@@ -62,7 +62,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
                 }
 
                 var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
+                    .Select(x => new DbIndexDefinition
+                    {
+                        TableName = x.Item1,
+                        IndexName = x.Item2,
+                        ColumnName = x.Item3,
+                        IsUnique = x.Item4
+                    }).ToArray();
 
                 //make sure it doesn't already exist
                 if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsDictionary_id")) == false)
@@ -98,4 +104,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
             throw new NotImplementedException();
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs

@@ -120,7 +120,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
 
 
             var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             //in some databases there's an index (IX_Master) on the master column which needs to be dropped first
             var foundIndex = dbIndexes.FirstOrDefault(x => x.TableName.InvariantEquals("cmsTemplate") && x.ColumnName.InvariantEquals("master"));
@@ -161,4 +167,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
             return path;
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/UpdateUniqueIdToHaveCorrectIndexType.cs

@@ -15,7 +15,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
         public override void Up()
         {
             var indexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             // drop the index if it exists
             if (indexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoNodeUniqueID")))
@@ -32,4 +38,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
         public override void Down()
         { }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs

@@ -1,4 +1,7 @@
-using Umbraco.Core.Logging;
+using System;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models.Rdbms;
+using Umbraco.Core.Persistence.DatabaseAnnotations;
 using Umbraco.Core.Persistence.SqlSyntax;
 
 namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZero
@@ -13,22 +16,20 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
 
         public override void Up()
         {
-            var relationTypeCount = Context.Database.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoRelationType WHERE alias=@alias",
-                new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
-
-            if (relationTypeCount > 0)
-                return;
-
-            var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
-            Insert.IntoTable("umbracoRelationType").Row(new
+            var exists = Context.Database.FirstOrDefault<RelationTypeDto>("WHERE alias=@alias", new { alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias });
+            if (exists == null)
             {
-                typeUniqueId = uniqueId,
-                alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
-                name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
-                childObjectType = Constants.ObjectTypes.MediaType,
-                parentObjectType = Constants.ObjectTypes.MediaType,
-                dual = false
-            });
+                var uniqueId = (Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias + "____" + Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName).ToGuid();
+                Insert.IntoTable("umbracoRelationType").Row(new
+                {
+                    typeUniqueId = uniqueId,
+                    alias = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteAlias,
+                    name = Constants.Conventions.RelationTypes.RelateParentMediaFolderOnDeleteName,
+                    childObjectType = Constants.ObjectTypes.MediaType,
+                    parentObjectType = Constants.ObjectTypes.MediaType,
+                    dual = false
+                });
+            }
         }
 
         public override void Down()

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs

@@ -15,35 +15,21 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
 
         public override void Up()
         {
-            Execute.Code(database =>
-            {
-                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-                // Some people seem to have a constraint in their DB instead of an index, we'd need to drop that one
-                // See: https://our.umbraco.com/forum/using-umbraco-and-getting-started/93282-upgrade-from-711-to-712-fails
-                var constraints = SqlSyntax.GetConstraintsPerTable(database).Distinct().ToArray();
-                if (constraints.Any(x => x.Item2.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
+            var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
+                .Select(x => new DbIndexDefinition()
                 {
-                    localContext.Delete.UniqueConstraint("IX_umbracoLanguage_languageISOCode").FromTable("umbracoLanguage");
-                    return localContext.GetSql();
-                }
-                return null;
-            });
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
-            Execute.Code(database =>
+            //Ensure the index exists before dropping it
+            if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
             {
-                var localContext = new LocalMigrationContext(Context.CurrentDatabaseProvider, database, SqlSyntax, Logger);
-
-                //Now check for indexes of that name and drop that if it exists
-                var dbIndexes = SqlSyntax.GetDefinedIndexes(database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
-                if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_umbracoLanguage_languageISOCode")))
-                {
-                    localContext.Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
-                    return localContext.GetSql();
-                }
-                return null;
-            });
-
+                Delete.Index("IX_umbracoLanguage_languageISOCode").OnTable("umbracoLanguage");
+            }
+            
             Alter.Table("umbracoLanguage")
                 .AlterColumn("languageISOCode")
                 .AsString(14)
@@ -52,8 +38,6 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwelveZ
             Create.Index("IX_umbracoLanguage_languageISOCode")
                 .OnTable("umbracoLanguage")
                 .OnColumn("languageISOCode")
-                .Ascending()
-                .WithOptions()
                 .Unique();
         }
 

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddMissingForeignKeyForContentType.cs

@@ -48,8 +48,14 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
                 //Some very old schemas don't have an index on the cmsContentType.nodeId column, I'm not actually sure when it was added but 
                 // it is absolutely required to exist in order to add other foreign keys and much better for perf, so we'll need to check it's existence
                 // this came to light from this issue: http://issues.umbraco.org/issue/U4-4133
-                var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                    .Select(x => new DbIndexDefinition(x)).ToArray();
+                var dbIndexes = SqlSyntaxContext.SqlSyntaxProvider.GetDefinedIndexes(Context.Database)
+                    .Select(x => new DbIndexDefinition()
+                    {
+                        TableName = x.Item1,
+                        IndexName = x.Item2,
+                        ColumnName = x.Item3,
+                        IsUnique = x.Item4
+                    }).ToArray();
                 if (dbIndexes.Any(x => x.IndexName.InvariantEquals("IX_cmsContentType")) == false)
                 {
                     Create.Index("IX_cmsContentType").OnTable("cmsContentType").OnColumn("nodeId").Ascending().WithOptions().Unique();
@@ -76,4 +82,4 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenTwoZero
             throw new DataLossException("Cannot downgrade from a version 7.2 database to a prior version, the database schema has already been modified");
         }
     }
-}
+}

src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs

@@ -20,7 +20,13 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSixTwoZero
         {
 
             var dbIndexes = SqlSyntax.GetDefinedIndexes(Context.Database)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
 
             //do not create any indexes if they already exist in the database
 
@@ -112,4 +118,4 @@ DROP TABLE ""umbracoUserLogins_temp""");
 
         }
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs

@@ -53,8 +53,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         string TruncateTable { get; }
         string CreateConstraint { get; }
         string DeleteConstraint { get; }
-
-        [Obsolete("This is never used, use the Format(ForeignKeyDefinition) instead")]
         string CreateForeignKeyConstraint { get; }
         string DeleteDefaultConstraint { get; }
         string FormatDateTime(DateTime date, bool includeTime = true);
@@ -80,32 +78,9 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         IEnumerable<string> GetTablesInSchema(Database db);
         IEnumerable<ColumnInfo> GetColumnsInSchema(Database db);
-
-        /// <summary>
-        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, ConstraintName
-        /// </returns>
         IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db);
-
-        /// <summary>
-        /// Returns all constraints defined in the database (Primary keys, foreign keys, unique constraints...) (does not include indexes)
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, ColumnName, ConstraintName
-        /// </returns>
         IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db);
 
-        /// <summary>
-        /// Returns all defined Indexes in the database excluding primary keys
-        /// </summary>
-        /// <param name="db"></param>
-        /// <returns>
-        /// A Tuple containing: TableName, IndexName, ColumnName, IsUnique
-        /// </returns>
         IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db);
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs

@@ -78,7 +78,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return list;
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
         {
             List<Tuple<string, string>> list;
@@ -101,7 +100,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return list;
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
         {
             List<Tuple<string, string, string>> list;
@@ -128,7 +126,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return list;
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
         {
             List<Tuple<string, string, string, bool>> list;
@@ -404,4 +401,4 @@ ORDER BY TABLE_NAME, INDEX_NAME",
             return PetaPocoExtensions.EscapeAtSymbols(MySql.Data.MySqlClient.MySqlHelper.EscapeString(val));
         }
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs

@@ -10,7 +10,7 @@ namespace Umbraco.Core.Persistence.SqlSyntax
     /// <summary>
     /// Represents an SqlSyntaxProvider for Sql Ce
     /// </summary>
-    [SqlSyntaxProvider(Constants.DatabaseProviders.SqlCe)]
+    [SqlSyntaxProviderAttribute(Constants.DatabaseProviders.SqlCe)]
     public class SqlCeSyntaxProvider : MicrosoftSqlSyntaxProviderBase<SqlCeSyntaxProvider>
     {
         public SqlCeSyntaxProvider()
@@ -123,27 +123,40 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                    item.IS_NULLABLE, item.DATA_TYPE)).ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
         {
             var items = db.Fetch<dynamic>("SELECT TABLE_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS");
-            return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
+            var indexItems = db.Fetch<dynamic>("SELECT TABLE_NAME, INDEX_NAME FROM INFORMATION_SCHEMA.INDEXES");
+            return
+                items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME))
+                     .Union(
+                         indexItems.Select(
+                             indexItem => new Tuple<string, string>(indexItem.TABLE_NAME, indexItem.INDEX_NAME)))
+                     .ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
         {
-            var items = db.Fetch<dynamic>("SELECT TABLE_NAME, COLUMN_NAME, CONSTRAINT_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
-            return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
+            var items =
+                db.Fetch<dynamic>(
+                    "SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE");
+            var indexItems = db.Fetch<dynamic>("SELECT INDEX_NAME, TABLE_NAME, COLUMN_NAME FROM INFORMATION_SCHEMA.INDEXES");
+            return
+                items.Select(
+                    item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME))
+                     .Union(
+                         indexItems.Select(
+                             indexItem =>
+                             new Tuple<string, string, string>(indexItem.TABLE_NAME, indexItem.COLUMN_NAME,
+                                                               indexItem.INDEX_NAME))).ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
         {
             var items =
                 db.Fetch<dynamic>(
                     @"SELECT TABLE_NAME, INDEX_NAME, COLUMN_NAME, [UNIQUE] FROM INFORMATION_SCHEMA.INDEXES 
-WHERE PRIMARY_KEY=0
+WHERE INDEX_NAME NOT LIKE 'PK_%'
 ORDER BY TABLE_NAME, INDEX_NAME");
             return
                 items.Select(
@@ -202,4 +215,4 @@ ORDER BY TABLE_NAME, INDEX_NAME");
         public override string DropIndex { get { return "DROP INDEX {1}.{0}"; } }
         
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs

@@ -88,7 +88,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
                                    item.IS_NULLABLE, item.DATA_TYPE)).ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string>> GetConstraintsPerTable(Database db)
         {
             var items =
@@ -97,7 +96,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return items.Select(item => new Tuple<string, string>(item.TABLE_NAME, item.CONSTRAINT_NAME)).ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string>> GetConstraintsPerColumn(Database db)
         {
             var items =
@@ -106,7 +104,6 @@ namespace Umbraco.Core.Persistence.SqlSyntax
             return items.Select(item => new Tuple<string, string, string>(item.TABLE_NAME, item.COLUMN_NAME, item.CONSTRAINT_NAME)).ToList();
         }
 
-        /// <inheritdoc />
         public override IEnumerable<Tuple<string, string, string, bool>> GetDefinedIndexes(Database db)
         {
             var items =
@@ -116,7 +113,7 @@ CASE WHEN I.is_unique_constraint = 1 OR  I.is_unique = 1 THEN 1 ELSE 0 END AS [U
 from sys.tables as T inner join sys.indexes as I on T.[object_id] = I.[object_id] 
    inner join sys.index_columns as IC on IC.[object_id] = I.[object_id] and IC.[index_id] = I.[index_id] 
    inner join sys.all_columns as AC on IC.[object_id] = AC.[object_id] and IC.[column_id] = AC.[column_id] 
-WHERE I.is_primary_key = 0
+WHERE I.name NOT LIKE 'PK_%'
 order by T.name, I.name");
             return items.Select(item => new Tuple<string, string, string, bool>(item.TABLE_NAME, item.INDEX_NAME, item.COLUMN_NAME,
                 item.UNIQUE == 1)).ToList();
@@ -186,4 +183,4 @@ order by T.name, I.name");
 
 
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs

@@ -537,11 +537,10 @@ namespace Umbraco.Core.Persistence.SqlSyntax
 
         public virtual string CreateConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} {2} ({3})"; } }
         public virtual string DeleteConstraint { get { return "ALTER TABLE {0} DROP CONSTRAINT {1}"; } }
-        
         public virtual string CreateForeignKeyConstraint { get { return "ALTER TABLE {0} ADD CONSTRAINT {1} FOREIGN KEY ({2}) REFERENCES {3} ({4}){5}{6}"; } }
 
         public virtual string ConvertIntegerToOrderableString { get { return "REPLACE(STR({0}, 8), SPACE(1), '0')"; } }
         public virtual string ConvertDateToOrderableString { get { return "CONVERT(nvarchar, {0}, 102)"; } }
         public virtual string ConvertDecimalToOrderableString { get { return "REPLACE(STR({0}, 20, 9), SPACE(1), '0')"; } }
     }
-}
+}

src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs

@@ -9,7 +9,13 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         public static IEnumerable<DbIndexDefinition> GetDefinedIndexesDefinitions(this ISqlSyntaxProvider sql, Database db)
         {
             return sql.GetDefinedIndexes(db)
-                .Select(x => new DbIndexDefinition(x)).ToArray();
+                .Select(x => new DbIndexDefinition()
+                {
+                    TableName = x.Item1,
+                    IndexName = x.Item2,
+                    ColumnName = x.Item3,
+                    IsUnique = x.Item4
+                }).ToArray();
         }
 
         /// <summary>
@@ -51,4 +57,4 @@ namespace Umbraco.Core.Persistence.SqlSyntax
         In,
         NotIn
     }
-}
+}

src/Umbraco.Core/PropertyEditors/ValueConverters/FlexibleDropdownPropertyValueConverter.cs

@@ -42,19 +42,18 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters
                 return null;
             }
 
-            var isMultipleDataType = IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias);
-
             var selectedValues = (string[]) source;
-            
             if (selectedValues.Any())
             {
-                if (isMultipleDataType)
+                if (IsMultipleDataType(propertyType.DataTypeId, propertyType.PropertyEditorAlias))
+                {
                     return selectedValues;
+                }
 
                 return selectedValues.First();
             }
 
-            return isMultipleDataType ? source : string.Empty;
+            return source;
         }
 
         public Type GetPropertyValueType(PublishedPropertyType propertyType)

src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js

@@ -39,7 +39,7 @@ angular.module("umbraco.directives")
             '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" ng-dblclick="load(node)" >' +
             //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog
             //'<ins ng-if="tree.enablelistviewsearch && node.metaData.isContainer" class="umb-tree-node-search icon-search" ng-click="searchNode(node, $event)" alt="searchAltText"></ins>' + 
-            '<ins data-element="tree-item-expand" ng-class="{\'icon-navigation-right\': !node.expanded || node.metaData.isContainer, \'icon-navigation-down\': node.expanded && !node.metaData.isContainer}" ng-click="load(node)">&nbsp;</ins>' +
+            '<ins data-element="tree-item-expand" ng-class="{\'icon-navigation-right\': !node.expanded || enablelistviewexpand === \'true\', \'icon-navigation-down\': node.expanded || true}" ng-click="load(node)">&nbsp;</ins>' +
             '<i class="icon umb-tree-icon sprTree" ng-click="select(node, $event)"></i>' +
             '<a class="umb-tree-item__label" href="#/{{node.routePath}}" ng-click="select(node, $event)"></a>' +
             //NOTE: These are the 'option' elipses

src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js

@@ -761,8 +761,6 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 		 * @param {string} input the string to parse      
 		 */
 		getAnchorNames: function (input) {
-      if (!input) return [];
-        
 			var anchorPattern = /<a id=\\"(.*?)\\">/gi;
 			var matches = input.match(anchorPattern);
 			var anchors = [];
@@ -773,9 +771,7 @@ function tinyMceService($log, imageHelper, $http, $timeout, macroResource, macro
 				});
 			}
 
-			return anchors.filter(function(val, i, self) {
-          return self.indexOf(val) === i;
-      });
+			return anchors;
 		},
 
 		insertLinkInEditor: function (editor, target, anchorElm) {

src/Umbraco.Web.UI.Client/src/less/components/umb-nested-content.less

@@ -212,14 +212,3 @@
     position: relative;
     transform: translate(-50%, -25%);
 }
-
-
-// this resolves the layout issue introduced in nested content in 7.12 with the addition of the input for link anchors
-// the attribute selector ensures the change only applies to the linkpicker overlay
-.form-horizontal .umb-nested-content--narrow [ng-controller*="Umbraco.Overlays.LinkPickerController"] .controls-row {
-    margin-left:0!important;
-    
-    .umb-textarea, .umb-textstring {
-        width:100%;
-    }
-}

src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html

@@ -7,7 +7,7 @@
 	           placeholder="@general_url"
 	           class="umb-editor umb-textstring"
 	           ng-model="target.url"
-	           ng-disabled="target.id || target.udi" />
+	           ng-disabled="target.id" />
 	</umb-control-group>
 
 	<umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">

src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html

@@ -6,7 +6,7 @@
                placeholder="@general_url"
                class="umb-editor umb-textstring"
                ng-model="model.target.url"
-               ng-disabled="model.target.id || model.target.udi" />
+               ng-disabled="model.target.id" />
     </umb-control-group>
 
     <umb-control-group label="@defaultdialogs_anchorLinkPicker" class="umb-property--push">

src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js

@@ -162,9 +162,7 @@ angular.module("umbraco").controller("Umbraco.Overlays.TreePickerController",
 
             tree = args.tree;
 
-            var nodeHasPath = typeof node !== "undefined" && typeof node.path !== "undefined";
-            var startNodeNotDefined = typeof dialogOptions.startNodeId === "undefined" || dialogOptions.startNodeId === "" || dialogOptions.startNodeId === "-1";
-            if (startNodeNotDefined && nodeHasPath) {
+            if (node && node.path) {
                 $scope.dialogTreeEventHandler.syncTree({ path: node.path, activate: false });
             }
 

src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs

@@ -17,13 +17,11 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
     {
         private readonly DatabaseContext _databaseContext;
         private readonly ILocalizedTextService _textService;
-        private readonly ILogger _logger;
 
         public DatabaseSchemaValidationHealthCheck(HealthCheckContext healthCheckContext) : base(healthCheckContext)
         {
             _databaseContext = HealthCheckContext.ApplicationContext.DatabaseContext;
             _textService = healthCheckContext.ApplicationContext.Services.TextService;
-            _logger = healthCheckContext.ApplicationContext.ProfilingLogger.Logger;
         }
 
         public override HealthCheckStatus ExecuteAction(HealthCheckAction action)
@@ -41,10 +39,10 @@ namespace Umbraco.Web.HealthCheck.Checks.DataIntegrity
         {
             var results = _databaseContext.ValidateDatabaseSchema();
 
-            _logger.Warn(typeof(DatabaseSchemaValidationHealthCheck), _textService.Localize("databaseSchemaValidationCheckDatabaseLogMessage"));
+            LogHelper.Warn(typeof(DatabaseSchemaValidationHealthCheck), _textService.Localize("databaseSchemaValidationCheckDatabaseLogMessage"));
             foreach(var error in results.Errors)
             {
-                _logger.Warn(typeof(DatabaseSchemaValidationHealthCheck), error.Item1 + ": " + error.Item2);
+                LogHelper.Warn(typeof(DatabaseSchemaValidationHealthCheck), error.Item1 + ": " + error.Item2);
             }
 
             if(results.Errors.Count > 0)

src/Umbraco.Web/Scheduling/KeepAlive.cs

@@ -13,15 +13,12 @@ namespace Umbraco.Web.Scheduling
     internal class KeepAlive : RecurringTaskBase
     {
         private readonly ApplicationContext _appContext;
-        private static HttpClient _httpClient;
 
-        public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
+        public KeepAlive(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds, 
             ApplicationContext appContext)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _appContext = appContext;
-            if (_httpClient == null)
-                _httpClient = new HttpClient();
         }
 
         private ILogger Logger { get { return _appContext.ProfilingLogger.Logger; } }
@@ -29,7 +26,7 @@ namespace Umbraco.Web.Scheduling
         public override async Task<bool> PerformRunAsync(CancellationToken token)
         {
             if (_appContext == null) return true; // repeat...
-
+            
             switch (_appContext.GetCurrentServerRole())
             {
                 case ServerRole.Slave:
@@ -61,9 +58,11 @@ namespace Umbraco.Web.Scheduling
                     }
 
                     var url = umbracoAppUrl + "/ping.aspx";
-
-                    var request = new HttpRequestMessage(HttpMethod.Get, url);
-                    var result = await _httpClient.SendAsync(request, token);
+                    using (var wc = new HttpClient())
+                    {
+                        var request = new HttpRequestMessage(HttpMethod.Get, url);
+                        var result = await wc.SendAsync(request, token);
+                    }
                 }
                 catch (Exception e)
                 {
@@ -79,4 +78,4 @@ namespace Umbraco.Web.Scheduling
             get { return true; }
         }
     }
-}
+}

src/umbraco.sln

@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-1
 		..\apidocs\docfx.json = ..\apidocs\docfx.json
 		..\apidocs\index.md = ..\apidocs\index.md
 		..\LICENSE.md = ..\LICENSE.md
+		..\README.md = ..\README.md
 		..\apidocs\toc.yml = ..\apidocs\toc.yml
 	EndProjectSection
 EndProject
@@ -20,6 +21,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{227C3B55-80E5-4E7E-A802-BE16C5128B9D}"
 	ProjectSection(SolutionItems) = preProject
 		..\build\build.ps1 = ..\build\build.ps1
+		..\build\InstallGit.cmd = ..\build\InstallGit.cmd
+		..\build\RevertToCleanInstall.bat = ..\build\RevertToCleanInstall.bat
+		..\build\RevertToEmptyInstall.bat = ..\build\RevertToEmptyInstall.bat
 		..\build\setversion.ps1 = ..\build\setversion.ps1
 		..\build\NuSpecs\UmbracoCms.Core.nuspec = ..\build\NuSpecs\UmbracoCms.Core.nuspec
 		..\build\NuSpecs\UmbracoCms.nuspec = ..\build\NuSpecs\UmbracoCms.nuspec